colocando na coluna "sumario"

dadosjusbr · Nov 30, 2023 · 6019324 · 6019324
1 parent 7ec59ac
commit 6019324
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 30 deletions.
diff --git a/models/monthlyInfo.go b/models/monthlyInfo.go
@@ -35,8 +35,7 @@ type AgencyMonthlyInfo struct {
 	Package           *Backup                `json:"package,omitempty"`     // Making this a pointer because it should be an optional field due to backwards compatibility.
 	Meta              *Meta                  `json:"meta,omitempty"`
 	Score             *Score                 `json:"score,omitempty"`
-	Duration          float64                `json:"duration,omitempty"`     // Crawling duration (seconds)
-	ItemSummary       *ItemSummary           `json:"item_summary,omitempty"` // Summary of aggregated values by item
+	Duration          float64                `json:"duration,omitempty"` // Crawling duration (seconds)
 }
 
 type Meta struct {
@@ -104,8 +103,3 @@ type Remunerations struct {
 	NumOther     int    `json:"num_outras,omitempty"`
 	ZipUrl       string `json:"zip_url,omitempty"`
 }
-
-type ItemSummary struct {
-	FoodAllowance float64 `json:"auxilio-alimentacao,omitempty"`
-	Others        float64 `json:"outras,omitempty"` // valor agregado de outras rubricas não identificadas
-}
diff --git a/models/summary.go b/models/summary.go
@@ -16,6 +16,7 @@ type Summary struct {
 	Discounts          DataSummary `json:"descontos,omitempty"`           //  Statistics (Max, Min, Median, Total)
 	Remunerations      DataSummary `json:"remuneracoes,omitempty"`        //  Statistics (Max, Min, Median, Total)
 	IncomeHistogram    map[int]int `json:"histograma_renda,omitempty"`
+	ItemSummary        ItemSummary `json:"resumo_rubricas,omitempty"` // resumo de valores agregadado por rubrica
 }
 
 // DataSummary A Struct containing data summary with statistics.
@@ -25,3 +26,8 @@ type DataSummary struct {
 	Average float64 `json:"media,omitempty"`
 	Total   float64 `json:"total,omitempty"`
 }
+
+type ItemSummary struct {
+	FoodAllowance float64 `json:"auxilio_alimentacao,omitempty"`
+	Others        float64 `json:"outras,omitempty"` // valor agregado de outras rubricas não identificadas
+}
diff --git a/repo/database/dto/monthlyInfoDTO.go b/repo/database/dto/monthlyInfoDTO.go
@@ -31,7 +31,6 @@ type AgencyMonthlyInfoDTO struct {
 	Duration       float64        `gorm:"column:duracao_segundos"` // Tempo de execução da coleta em segundos
 	Meta
 	Score
-	ItemSummary datatypes.JSON `gorm:"column:resumo"` // Resumo de valores agregados por item/rubrica
 }
 
 func (AgencyMonthlyInfoDTO) TableName() string {
@@ -63,7 +62,6 @@ func (a AgencyMonthlyInfoDTO) ConvertToModel() (*models.AgencyMonthlyInfo, error
 	var summary models.Summary
 	var procInfo coleta.ProcInfo
 	var pkg models.Backup
-	var itemSummary models.ItemSummary
 
 	backupBytes, err := a.Backup.MarshalJSON()
 	if err != nil {
@@ -101,15 +99,6 @@ func (a AgencyMonthlyInfoDTO) ConvertToModel() (*models.AgencyMonthlyInfo, error
 		return nil, fmt.Errorf("error while unmarshaling package: %q", err)
 	}
 
-	itemSummaryBytes, err := a.ItemSummary.MarshalJSON()
-	if err != nil {
-		return nil, fmt.Errorf("error while marshaling item summary: %q", err)
-	}
-	err = json.Unmarshal(itemSummaryBytes, &itemSummary)
-	if err != nil {
-		return nil, fmt.Errorf("error while unmarshaling item summary: %q", err)
-	}
-
 	return &models.AgencyMonthlyInfo{
 		AgencyID:          a.AgencyID,
 		Month:             a.Month,
@@ -137,12 +126,11 @@ func (a AgencyMonthlyInfoDTO) ConvertToModel() (*models.AgencyMonthlyInfo, error
 			BaseRevenue:      a.Meta.BaseRevenue,
 			OtherRecipes:     a.Meta.OtherRecipes,
 		},
-		Summary:     &summary,
-		Backups:     []models.Backup{backup},
-		ProcInfo:    &procInfo,
-		Package:     &pkg,
-		Duration:    a.Duration,
-		ItemSummary: &itemSummary,
+		Summary:  &summary,
+		Backups:  []models.Backup{backup},
+		ProcInfo: &procInfo,
+		Package:  &pkg,
+		Duration: a.Duration,
 	}, nil
 }
 
@@ -167,10 +155,6 @@ func NewAgencyMonthlyInfoDTO(agmi models.AgencyMonthlyInfo) (*AgencyMonthlyInfoD
 	if err != nil {
 		return nil, fmt.Errorf("error while marshaling package: %q", err)
 	}
-	itemSummary, err := json.Marshal(agmi.ItemSummary)
-	if err != nil {
-		return nil, fmt.Errorf("error while marshaling summary: %q", err)
-	}
 
 	var score Score
 	if agmi.Score != nil {
@@ -225,7 +209,6 @@ func NewAgencyMonthlyInfoDTO(agmi models.AgencyMonthlyInfo) (*AgencyMonthlyInfoD
 		ProcInfo:       procInfo,
 		Package:        pkg,
 		Duration:       agmi.Duration,
-		ItemSummary:    itemSummary,
 	}, nil
 }
 

diff --git a/repo/database/init_db.sql b/repo/database/init_db.sql
@@ -43,7 +43,6 @@ create table coletas
     backups                      json,
     formato_aberto               boolean,
     duracao_segundos             double precision,
-    resumo                       json,
 
     constraint coleta_pk primary key (id,timestamp),
     constraint coleta_orgao_fk foreign key (id_orgao) references orgaos(id) on delete cascade