diff --git a/models/monthlyInfo.go b/models/monthlyInfo.go index c90d0c7..e1e42ff 100644 --- a/models/monthlyInfo.go +++ b/models/monthlyInfo.go @@ -37,6 +37,7 @@ type AgencyMonthlyInfo struct { Score *Score `json:"score,omitempty"` Duration float64 `json:"duration,omitempty"` // Crawling duration (seconds) ManualCollection bool `json:"coleta_manual,omitempty"` // If the data was collected manually + Inconsistent bool `json:"inconsistent"` // If the data is inconsistent } type Meta struct { @@ -94,6 +95,7 @@ type AnnualSummary struct { NumMonthsWithData int `json:"months_with_data,omitempty"` Package *Backup `json:"package,omitempty"` ItemSummary ItemSummary `json:"item_summary,omitempty"` + Inconsistent bool `json:"inconsistent,omitempty"` // If the data is inconsistent } type RemmunerationSummary struct { diff --git a/repo/database/dto/annuaISummary.go b/repo/database/dto/annuaISummary.go index d527bd3..4d4d18e 100644 --- a/repo/database/dto/annuaISummary.go +++ b/repo/database/dto/annuaISummary.go @@ -18,6 +18,7 @@ type AnnualSummaryDTO struct { RemunerationsPerCapita float64 `gorm:"column:remuneracoes_membro"` NumMonthsWithData int `gorm:"column:meses_com_dados"` ItemSummary ItemSummary `gorm:"embedded"` + Inconsistent bool `gorm:"column:inconsistente"` } func NewAnnualSummaryDTO(ami models.AnnualSummary) *AnnualSummaryDTO { @@ -44,6 +45,7 @@ func NewAnnualSummaryDTO(ami models.AnnualSummary) *AnnualSummaryDTO { HealthAllowance: ami.ItemSummary.HealthAllowance, Others: ami.ItemSummary.Others, }, + Inconsistent: ami.Inconsistent, } } @@ -71,5 +73,6 @@ func (ami *AnnualSummaryDTO) ConvertToModel() *models.AnnualSummary { HealthAllowance: ami.ItemSummary.HealthAllowance, Others: ami.ItemSummary.Others, }, + Inconsistent: ami.Inconsistent, } } diff --git a/repo/database/dto/monthlyInfoDTO.go b/repo/database/dto/monthlyInfoDTO.go index 18b2f6d..af82645 100644 --- a/repo/database/dto/monthlyInfoDTO.go +++ b/repo/database/dto/monthlyInfoDTO.go @@ -32,6 +32,7 @@ type AgencyMonthlyInfoDTO struct { Meta Score ManualCollection bool `gorm:"column:manual"` // Tempo de execução da coleta em segundos + Inconsistent bool `gorm:"column:inconsistente"` } func (AgencyMonthlyInfoDTO) TableName() string { @@ -133,6 +134,7 @@ func (a AgencyMonthlyInfoDTO) ConvertToModel() (*models.AgencyMonthlyInfo, error Package: &pkg, Duration: a.Duration, ManualCollection: a.ManualCollection, + Inconsistent: a.Inconsistent, }, nil } @@ -212,6 +214,7 @@ func NewAgencyMonthlyInfoDTO(agmi models.AgencyMonthlyInfo) (*AgencyMonthlyInfoD Package: pkg, Duration: agmi.Duration, ManualCollection: agmi.ManualCollection, + Inconsistent: agmi.Inconsistent, }, nil } diff --git a/repo/database/postgres.go b/repo/database/postgres.go index 1fc1d13..76be3c5 100644 --- a/repo/database/postgres.go +++ b/repo/database/postgres.go @@ -284,7 +284,14 @@ func (p *PostgresDB) GetMonthlyInfo(agencies []models.Agency, year int) (map[str for _, agency := range agencies { var dtoAgmis []dto.AgencyMonthlyInfoDTO //Pegando as coletas do postgres, filtrando por órgão, ano e a coleta atual. - m := p.db.Model(&dto.AgencyMonthlyInfoDTO{}) + m := p.db.Model(&dto.AgencyMonthlyInfoDTO{}).Select(`coletas.*, EXISTS ( + SELECT 1 + FROM remuneracoes r + WHERE inconsistente = TRUE + AND r.orgao = coletas.id_orgao + AND r.ano = coletas.ano + and r.mes = coletas.mes + ) AS inconsistente`) m = m.Where("id_orgao = ? AND ano = ? AND atual = TRUE AND (procinfo::text = 'null' OR procinfo IS NULL) ", agency.ID, year) m = m.Order("mes ASC") if err := m.Find(&dtoAgmis).Error; err != nil { @@ -327,7 +334,14 @@ func (p *PostgresDB) GetAnnualSummary(agency string) ([]models.AnnualSummary, er MAX(media_por_membro.salario) AS remuneracao_base_membro, MAX(media_por_membro.beneficios) AS outras_remuneracoes_membro, MAX(media_por_membro.descontos) AS descontos_membro, - MAX(media_por_membro.remuneracao) AS remuneracoes_membro` + MAX(media_por_membro.remuneracao) AS remuneracoes_membro, + EXISTS ( + SELECT 1 + FROM remuneracoes r + WHERE inconsistente = TRUE + AND r.orgao = coletas.id_orgao + AND r.ano = coletas.ano + ) AS inconsistente` join := `LEFT JOIN media_por_membro on coletas.ano = media_por_membro.ano and coletas.id_orgao = media_por_membro.orgao` m := p.db.Model(&dtoAgmi).Select(query).Joins(join) @@ -346,7 +360,15 @@ func (p *PostgresDB) GetAnnualSummary(agency string) ([]models.AnnualSummary, er func (p *PostgresDB) GetOMA(month int, year int, agency string) (*models.AgencyMonthlyInfo, *models.Agency, error) { var dtoAgmi dto.AgencyMonthlyInfoDTO id := fmt.Sprintf("%s/%s/%d", strings.ToLower(agency), dto.AddZeroes(month), year) - m := p.db.Model(dto.AgencyMonthlyInfoDTO{}).Where("id = ? AND atual = true", id).First(&dtoAgmi) + m := p.db.Model(dto.AgencyMonthlyInfoDTO{}).Select(`coletas.*, EXISTS ( + SELECT 1 + FROM remuneracoes r + WHERE inconsistente = TRUE + AND r.orgao = coletas.id_orgao + AND r.ano = coletas.ano + and r.mes = coletas.mes + ) AS inconsistente`) + m = m.Where("id = ? AND atual = true", id).First(&dtoAgmi) if err := m.Error; err != nil { if err == gorm.ErrRecordNotFound { return nil, nil, fmt.Errorf("there is no data with this parameters") diff --git a/repo/database/postgres_test.go b/repo/database/postgres_test.go index 4570a65..a4285c6 100644 --- a/repo/database/postgres_test.go +++ b/repo/database/postgres_test.go @@ -1142,6 +1142,8 @@ func (g getAnnualSummary) testWhenMonthlyInfoExists(t *testing.T) { assert.Equal(t, amis[1].ItemSummary.Vacation, returnedAmis[1].ItemSummary.Vacation) assert.Equal(t, 1000.0, returnedAmis[2].BaseRemunerationPerCapita) assert.Equal(t, 1200.0, returnedAmis[2].OtherRemunerationsPerCapita) + assert.Equal(t, amis[0].Inconsistent, returnedAmis[0].Inconsistent) + assert.Equal(t, false, returnedAmis[0].Inconsistent) truncateTables() }