renomeando struct e fields

dadosjusbr · Sep 11, 2024 · 340b156 · 340b156
1 parent 39065f3
commit 340b156
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 29 deletions.
diff --git a/uiapi/handlers.go b/uiapi/handlers.go
@@ -413,11 +413,11 @@ func (h handler) V2GetTotalsOfAgencyYear(c echo.Context) error {
 		},
 		MonthTotals:    monthTotalsOfYear,
 		SummaryPackage: pkg,
-		AveragePerCapita: &averagePerCapita{
-			BaseRemunerationPerCapita:   strAveragePerCapita.BaseRemunerationPerCapita,
-			OtherRemunerationsPerCapita: strAveragePerCapita.OtherRemunerationsPerCapita,
-			DiscountsPerCapita:          strAveragePerCapita.DiscountsPerCapita,
-			RemunerationsPerCapita:      strAveragePerCapita.RemunerationsPerCapita,
+		AveragePerCapita: &perCapitaData{
+			BaseRemuneration:   strAveragePerCapita.BaseRemuneration,
+			OtherRemunerations: strAveragePerCapita.OtherRemunerations,
+			Discounts:          strAveragePerCapita.Discounts,
+			Remunerations:      strAveragePerCapita.Remunerations,
 		},
 	}
 	return c.JSON(http.StatusOK, agencyTotalsYear)

diff --git a/uiapi/models.go b/uiapi/models.go
@@ -124,11 +124,11 @@ type agencyTotalsYear struct {
 }
 
 type v2AgencyTotalsYear struct {
-	Year             int               `json:"ano,omitempty"`
-	Agency           *agency           `json:"orgao,omitempty"`
-	AveragePerCapita *averagePerCapita `json:"media_por_membro,omitempty"`
-	MonthTotals      []v2MonthTotals   `json:"meses,omitempty"`
-	SummaryPackage   *backup           `json:"package,omitempty"`
+	Year             int             `json:"ano,omitempty"`
+	Agency           *agency         `json:"orgao,omitempty"`
+	AveragePerCapita *perCapitaData  `json:"media_por_membro,omitempty"`
+	MonthTotals      []v2MonthTotals `json:"meses,omitempty"`
+	SummaryPackage   *backup         `json:"package,omitempty"`
 }
 
 type backup struct {
@@ -294,9 +294,9 @@ type mensalRemuneration struct {
 	ItemSummary        itemSummary `json:"resumo_rubricas"`
 }
 
-type averagePerCapita struct {
-	BaseRemunerationPerCapita   float64 `json:"remuneracao_base"`
-	OtherRemunerationsPerCapita float64 `json:"outras_remuneracoes"`
-	DiscountsPerCapita          float64 `json:"descontos"`
-	RemunerationsPerCapita      float64 `json:"remuneracoes"`
+type perCapitaData struct {
+	BaseRemuneration   float64 `json:"remuneracao_base"`
+	OtherRemunerations float64 `json:"outras_remuneracoes"`
+	Discounts          float64 `json:"descontos"`
+	Remunerations      float64 `json:"remuneracoes"`
 }
diff --git a/uiapi/uiapi_test.go b/uiapi/uiapi_test.go
@@ -1141,13 +1141,13 @@ func (g getTotalsOfAgencyYear) testWhenDataExists(t *testing.T) {
 			OmbudsmanURL:  "http://www.tjal.jus.br/ombudsman",
 		},
 	}
-	avg := models.AveragePerCapita{
-		ID:                          "tjal",
-		Year:                        2020,
-		BaseRemunerationPerCapita:   33173.01121495333,
-		OtherRemunerationsPerCapita: 9119.563364485992,
-		DiscountsPerCapita:          10382.615233644861,
-		RemunerationsPerCapita:      33173.01121495333,
+	avg := models.PerCapitaData{
+		AgencyID:           "tjal",
+		Year:               2020,
+		BaseRemuneration:   33173.01121495333,
+		OtherRemunerations: 9119.563364485992,
+		Discounts:          10382.615233644861,
+		Remunerations:      33173.01121495333,
 	}
 
 	dbMock.EXPECT().Connect().Return(nil).Times(1)
@@ -1248,13 +1248,13 @@ func (g getTotalsOfAgencyYear) testWhenMonthlyInfoDoesNotExist(t *testing.T) {
 		TwitterHandle: "tjaloficial",
 		OmbudsmanURL:  "http://www.tjal.jus.br/ombudsman",
 	}
-	avg := models.AveragePerCapita{
-		ID:                          "tjal",
-		Year:                        2020,
-		BaseRemunerationPerCapita:   0,
-		OtherRemunerationsPerCapita: 0,
-		DiscountsPerCapita:          0,
-		RemunerationsPerCapita:      0,
+	avg := models.PerCapitaData{
+		AgencyID:           "tjal",
+		Year:               2020,
+		BaseRemuneration:   0,
+		OtherRemunerations: 0,
+		Discounts:          0,
+		Remunerations:      0,
 	}
 
 	dbMock.EXPECT().Connect().Return(nil).Times(1)