Merge pull request #576 from dadosjusbr/gratificacao_natalina

adicionando gratificacao natalina
dadosjusbr · Feb 15, 2024 · 685f8d0 · 685f8d0
2 parents 648fa4d + 7cf2854
commit 685f8d0
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 2 deletions.
diff --git a/docs/docs.go b/docs/docs.go
@@ -1046,6 +1046,9 @@ const docTemplate = `{
                 "auxilio_alimentacao": {
                     "type": "number"
                 },
+                "gratificacao_natalina": {
+                    "type": "number"
+                },
                 "indenizacao_de_ferias": {
                     "type": "number"
                 },
@@ -1391,6 +1394,9 @@ const docTemplate = `{
                 "auxilio_alimentacao": {
                     "type": "number"
                 },
+                "gratificacao_natalina": {
+                    "type": "number"
+                },
                 "indenizacao_de_ferias": {
                     "type": "number"
                 },

diff --git a/docs/swagger.json b/docs/swagger.json
@@ -1037,6 +1037,9 @@
                 "auxilio_alimentacao": {
                     "type": "number"
                 },
+                "gratificacao_natalina": {
+                    "type": "number"
+                },
                 "indenizacao_de_ferias": {
                     "type": "number"
                 },
@@ -1382,6 +1385,9 @@
                 "auxilio_alimentacao": {
                     "type": "number"
                 },
+                "gratificacao_natalina": {
+                    "type": "number"
+                },
                 "indenizacao_de_ferias": {
                     "type": "number"
                 },

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
@@ -187,6 +187,8 @@ definitions:
     properties:
       auxilio_alimentacao:
         type: number
+      gratificacao_natalina:
+        type: number
       indenizacao_de_ferias:
         type: number
       licenca_premio:
@@ -418,6 +420,8 @@ definitions:
     properties:
       auxilio_alimentacao:
         type: number
+      gratificacao_natalina:
+        type: number
       indenizacao_de_ferias:
         type: number
       licenca_premio:

diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	github.com/dadosjusbr/proto v0.0.0-20221212025627-91c60aa3cd12
-	github.com/dadosjusbr/storage v0.0.0-20240205184937-b9805fd9200e
+	github.com/dadosjusbr/storage v0.0.0-20240215133808-01101e0b3766
 	github.com/gocarina/gocsv v0.0.0-20220712153207-8b2118da4570
 	github.com/golang/mock v1.6.0
 	github.com/joho/godotenv v1.4.0

diff --git a/go.sum b/go.sum
@@ -44,6 +44,8 @@ github.com/dadosjusbr/storage v0.0.0-20240122222419-3472161adddb h1:yCHr4P7e8kBC
 github.com/dadosjusbr/storage v0.0.0-20240122222419-3472161adddb/go.mod h1:PszGy6CDoG3kNLjIsCmwD3MAWED7xL7U/OWj7ajsiHc=
 github.com/dadosjusbr/storage v0.0.0-20240205184937-b9805fd9200e h1:3cH5bjKv7JDuGSAU+7WCdtM/ov0pv/6XzTWhTMbyUgc=
 github.com/dadosjusbr/storage v0.0.0-20240205184937-b9805fd9200e/go.mod h1:PszGy6CDoG3kNLjIsCmwD3MAWED7xL7U/OWj7ajsiHc=
+github.com/dadosjusbr/storage v0.0.0-20240215133808-01101e0b3766 h1:u5Qem0JR196gPjsreNPaa1HTZI8/FExL0+XR+pMx+h4=
+github.com/dadosjusbr/storage v0.0.0-20240215133808-01101e0b3766/go.mod h1:PszGy6CDoG3kNLjIsCmwD3MAWED7xL7U/OWj7ajsiHc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

diff --git a/papi/handlers.go b/papi/handlers.go
@@ -336,6 +336,7 @@ func (h handler) V2GetMonthlyInfo(c echo.Context) error {
 							FoodAllowance:        monthlyInfo.Summary.ItemSummary.FoodAllowance,
 							BonusLicense:         monthlyInfo.Summary.ItemSummary.BonusLicense,
 							VacationCompensation: monthlyInfo.Summary.ItemSummary.VacationCompensation,
+							ChristmasBonus:       monthlyInfo.Summary.ItemSummary.ChristmasBonus,
 							Others:               monthlyInfo.Summary.ItemSummary.Others,
 						},
 					},
@@ -462,6 +463,7 @@ func (h handler) GetMonthlyInfosByYear(c echo.Context) error {
 									FoodAllowance:        mi.Summary.ItemSummary.FoodAllowance,
 									BonusLicense:         mi.Summary.ItemSummary.BonusLicense,
 									VacationCompensation: mi.Summary.ItemSummary.VacationCompensation,
+									ChristmasBonus:       mi.Summary.ItemSummary.ChristmasBonus,
 									Others:               mi.Summary.ItemSummary.Others,
 								},
 							},
@@ -676,7 +678,7 @@ func (h handler) V2GetAggregateIndexesWithParams(c echo.Context) error {
 //	@Produce		json
 //	@Success		200			{object}	[]aggregateIndexesByGroup	"Requisição bem sucedida."
 //	@Failure		500			{string}	string						"Erro interno do servidor."
-//	@Router			/v2/indice 																																													[get]
+//	@Router			/v2/indice 																																																					[get]
 func (h handler) V2GetAggregateIndexes(c echo.Context) error {
 	agregado := c.QueryParam("agregado")
 	detalhe := c.QueryParam("detalhe")
@@ -843,6 +845,7 @@ func (h handler) V2GetAllAgencyInformation(c echo.Context) error {
 							FoodAllowance:        c.Summary.ItemSummary.FoodAllowance,
 							BonusLicense:         c.Summary.ItemSummary.BonusLicense,
 							VacationCompensation: c.Summary.ItemSummary.VacationCompensation,
+							ChristmasBonus:       c.Summary.ItemSummary.ChristmasBonus,
 							Others:               c.Summary.ItemSummary.Others,
 						},
 					},

diff --git a/papi/models.go b/papi/models.go
@@ -26,6 +26,7 @@ type itemSummary struct {
 	FoodAllowance        float64 `json:"auxilio_alimentacao"`
 	BonusLicense         float64 `json:"licenca_premio"`
 	VacationCompensation float64 `json:"indenizacao_de_ferias"`
+	ChristmasBonus       float64 `json:"gratificacao_natalina"`
 	Others               float64 `json:"outras"` // valor agregado de outras rubricas não identificadas
 }
 

diff --git a/uiapi/handlers.go b/uiapi/handlers.go
@@ -126,6 +126,7 @@ func (h handler) V2GetSummaryOfAgency(c echo.Context) error {
 			FoodAllowance:        agencyMonthlyInfo.Summary.ItemSummary.FoodAllowance,
 			BonusLicense:         agencyMonthlyInfo.Summary.ItemSummary.BonusLicense,
 			VacationCompensation: agencyMonthlyInfo.Summary.ItemSummary.VacationCompensation,
+			ChristmasBonus:       agencyMonthlyInfo.Summary.ItemSummary.ChristmasBonus,
 			Others:               agencyMonthlyInfo.Summary.ItemSummary.Others,
 		},
 	}
@@ -344,6 +345,7 @@ func (h handler) V2GetTotalsOfAgencyYear(c echo.Context) error {
 					FoodAllowance:        agencyMonthlyInfo.Summary.ItemSummary.FoodAllowance,
 					BonusLicense:         agencyMonthlyInfo.Summary.ItemSummary.BonusLicense,
 					VacationCompensation: agencyMonthlyInfo.Summary.ItemSummary.VacationCompensation,
+					ChristmasBonus:       agencyMonthlyInfo.Summary.ItemSummary.ChristmasBonus,
 					Others:               agencyMonthlyInfo.Summary.ItemSummary.Others,
 				},
 			}
@@ -602,6 +604,7 @@ func (h handler) V2GetGeneralRemunerationFromYear(c echo.Context) error {
 				FoodAllowance:        d.ItemSummary.FoodAllowance,
 				BonusLicense:         d.ItemSummary.BonusLicense,
 				VacationCompensation: d.ItemSummary.VacationCompensation,
+				ChristmasBonus:       d.ItemSummary.ChristmasBonus,
 				Others:               d.ItemSummary.Others,
 			},
 		})
@@ -819,6 +822,7 @@ func (h handler) GetAnnualSummary(c echo.Context) error {
 			FoodAllowance:        s.ItemSummary.FoodAllowance,
 			BonusLicense:         s.ItemSummary.BonusLicense,
 			VacationCompensation: s.ItemSummary.VacationCompensation,
+			ChristmasBonus:       s.ItemSummary.ChristmasBonus,
 			Others:               s.ItemSummary.Others,
 		}
 		annualData = append(annualData, annualSummaryData{

diff --git a/uiapi/models.go b/uiapi/models.go
@@ -276,6 +276,7 @@ type itemSummary struct {
 	FoodAllowance        float64 `json:"auxilio_alimentacao"`
 	BonusLicense         float64 `json:"licenca_premio"`
 	VacationCompensation float64 `json:"indenizacao_de_ferias"`
+	ChristmasBonus       float64 `json:"gratificacao_natalina"`
 	Others               float64 `json:"outras"` // valor agregado de outras rubricas não identificadas
 }
 

diff --git a/uiapi/uiapi_test.go b/uiapi/uiapi_test.go
@@ -103,6 +103,7 @@ func (g getSummaryOfAgency) testWhenDataExists(t *testing.T) {
 				"auxilio_alimentacao": 100,
         		"licenca_premio": 150,
 				"indenizacao_de_ferias": 130,
+				"gratificacao_natalina": 120,
         		"outras": 200
 			}
 		}
@@ -959,6 +960,7 @@ func (g getGenerealRemunerationFromYear) testWhenDataExists(t *testing.T) {
 				FoodAllowance:        100,
 				BonusLicense:         150,
 				VacationCompensation: 125,
+				ChristmasBonus:       175,
 				Others:               200,
 			},
 		},
@@ -1010,6 +1012,7 @@ func (g getGenerealRemunerationFromYear) testWhenDataExists(t *testing.T) {
 					"auxilio_alimentacao": 100,
 					"licenca_premio": 150,
 					"indenizacao_de_ferias": 125,
+					"gratificacao_natalina": 175,
 					"outras": 200
 				  }
 			},
@@ -1024,6 +1027,7 @@ func (g getGenerealRemunerationFromYear) testWhenDataExists(t *testing.T) {
 					"auxilio_alimentacao": 100,
 					"licenca_premio": 0,
 					"indenizacao_de_ferias": 0,
+					"gratificacao_natalina": 0,
 					"outras": 200
 				  }
 			}
@@ -1182,6 +1186,7 @@ func (g getTotalsOfAgencyYear) testWhenDataExists(t *testing.T) {
 						"auxilio_alimentacao": 100,
         	            "licenca_premio": 150,
 						"indenizacao_de_ferias": 130,
+						"gratificacao_natalina": 120,
         	            "outras": 200
 					}
 				}
@@ -1331,6 +1336,7 @@ func (g getAnnualSummary) testWhenDataExists(t *testing.T) {
 				FoodAllowance:        100,
 				BonusLicense:         150,
 				VacationCompensation: 130,
+				ChristmasBonus:       170,
 				Others:               200,
 			},
 		},
@@ -1397,6 +1403,7 @@ func (g getAnnualSummary) testWhenDataExists(t *testing.T) {
 						"auxilio_alimentacao": 100,
 						"licenca_premio": 150,
 						"indenizacao_de_ferias": 130,
+						"gratificacao_natalina": 170,
 						"outras": 200
 					  }
 				}
@@ -1584,6 +1591,7 @@ func agencyMonthlyInfos() []models.AgencyMonthlyInfo {
 					FoodAllowance:        100,
 					BonusLicense:         150,
 					VacationCompensation: 130,
+					ChristmasBonus:       120,
 					Others:               200,
 				},
 			},