Skip to content

Commit 3c665f6

Browse files
krharumkrharum
committed
Refactor Dashboard components to remove unused status fields and simplify data handling #deploy-test-dolly-backend
1 parent b5d7a70 commit 3c665f6

5 files changed

Lines changed: 18 additions & 66 deletions

File tree

‎apps/dolly-backend/src/main/java/no/nav/dolly/domain/dto/DashboardPersonerDTO.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,4 @@ public class DashboardPersonerDTO {
1717
private Long personerTotalt;
1818
private Long nye;
1919
private Long gjenopprettede;
20-
private Long pdlFeil;
21-
private Long andreFeil;
2220
}

‎apps/dolly-backend/src/main/java/no/nav/dolly/domain/projection/BestillingerFragment.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,4 @@ public class BestillingerFragment {
1616
private LocalDate dato;
1717
private Long personer;
1818
private String gjenopprettstatus;
19-
private String pdlstatus;
20-
private String annenstatus;
2119
}

‎apps/dolly-backend/src/main/java/no/nav/dolly/repository/BestillingRepository.java‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -147,31 +147,16 @@ select count(*) personer,
147147
else 'NYBESTILLING'
148148
end as gjenopprettStatus,
149149
case
150-
when lower(bp.pdl_person_status) not like 'synkronisering%' then 'FEIL'
151-
when lower(bp.pdl_forvalter_status) like '%feil%' then 'FEIL'
152-
when lower(bp.pdl_ordre_status) like '%feil%' then 'FEIL'
153-
else 'OK'
154-
end as pdlStatus,
155-
case
156-
when lower(bp.pensjonforvalter_status) like '%feil%' then 'FEIL'
157-
when lower(bp.aareg_status) like '%feil%' then 'FEIL'
158-
when lower(bp.arenaforvalter_status) like '%feil%' then 'FEIL'
159-
when lower(bp.instdata_status) like '%feil%' then 'FEIL'
160-
when lower(bp.inntektsstub_status) like '%feil%' then 'FEIL'
161-
when lower(bp.inntektsmelding_status) like '%feil%' then 'FEIL'
162-
when lower(bp.sigrunstub_status) like '%feil%' then 'FEIL'
163-
when lower(bp.dokarkiv_status) like '%feil%' then 'FEIL'
164-
when lower(bp.feil) like '%feil%' then 'FEIL'
165-
else 'OK'
166-
end as annenStatus
150+
when b.pdl_import is not null then true
151+
else false
152+
end as testnorgeIdent
167153
from bestilling b
168154
join bestilling_progress bp on b.id = bp.bestilling_id
169-
group by dato, gjenopprettStatus, pdlStatus, annenStatus
155+
group by dato, gjenopprettStatus, testnorgeIdent
170156
order by dato desc
171157
""")
172158
Flux<BestillingerFragment> findBestillingerOrderBySistOppdatert();
173159

174-
175160
@Query("""
176161
select count(*) antall, to_char(b.sist_oppdatert, 'YYYY-MM') interval, br.epost
177162
from bestilling b

‎apps/dolly-backend/src/main/java/no/nav/dolly/service/DashboardService.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@ public Flux<DashboardPersonerDTO> getPersonerStatus() {
8282
.mapToLong(BestillingerFragment::getPersoner).sum())
8383
.nye(sumByStatus(fragmentliste, BestillingerFragment::getGjenopprettstatus, "NYBESTILLING"))
8484
.gjenopprettede(sumByStatus(fragmentliste, BestillingerFragment::getGjenopprettstatus, "GJENOPPRETTING"))
85-
.pdlFeil(sumByStatus(fragmentliste, BestillingerFragment::getPdlstatus, "FEIL"))
86-
.andreFeil(sumByStatus(fragmentliste, BestillingerFragment::getAnnenstatus, "FEIL"))
8785
.build())
8886
.sort(Comparator.comparing(DashboardPersonerDTO::getDato).reversed());
8987
}
@@ -182,8 +180,8 @@ public Flux<JsonNode> getFeilstatusSummert(int year, Month month) {
182180
.read(BestillingProgressDTO.class, row, metadata))
183181
.all())
184182
.groupBy(BestillingProgressDTO::getBestillingDato)
185-
.flatMap(Flux::collectList)
186-
.flatMap(this::tilFeilstatusSummert);
183+
.concatMap(Flux::collectList)
184+
.concatMap(this::tilFeilstatusSummert);
187185
}
188186

189187
public Flux<JsonNode> getFeilstatusDetaljert(int year, Month month, int day) {
@@ -237,8 +235,8 @@ public Flux<DashboardOversiktDTO> getPerioderOversikt() {
237235
}
238236

239237
private static long sumByStatus(List<BestillingerFragment> fragments,
240-
Function<BestillingerFragment, String> statusGetter,
241-
String value) {
238+
Function<BestillingerFragment, Object> statusGetter,
239+
Object value) {
242240

243241
return fragments.stream()
244242
.filter(f -> value.equals(statusGetter.apply(f)))

‎apps/dolly-backend/src/test/java/no/nav/dolly/service/DashboardServiceTest.java‎

Lines changed: 10 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ void shouldReturnEmptyWhenNoFragments() {
7676

7777
@Test
7878
void shouldSumPersonerTotaltForSingleDate() {
79-
var f1 = fragment(DATE_1, 5L, "NYBESTILLING", "OK", "OK");
80-
var f2 = fragment(DATE_1, 3L, "NYBESTILLING", "OK", "OK");
79+
var f1 = fragment(DATE_1, 5L, "NYBESTILLING");
80+
var f2 = fragment(DATE_1, 3L, "NYBESTILLING");
8181
when(bestillingRepository.findBestillingerOrderBySistOppdatert()).thenReturn(Flux.just(f1, f2));
8282

8383
StepVerifier.create(dashboardService.getPersonerStatus())
@@ -90,8 +90,8 @@ void shouldSumPersonerTotaltForSingleDate() {
9090

9191
@Test
9292
void shouldCountNyeByGjenopprettstatusNYBESTILLING() {
93-
var nybestilling = fragment(DATE_1, 4L, "NYBESTILLING", "OK", "OK");
94-
var gjenoppretting = fragment(DATE_1, 2L, "GJENOPPRETTING", "OK", "OK");
93+
var nybestilling = fragment(DATE_1, 4L, "NYBESTILLING");
94+
var gjenoppretting = fragment(DATE_1, 2L, "GJENOPPRETTING");
9595
when(bestillingRepository.findBestillingerOrderBySistOppdatert()).thenReturn(Flux.just(nybestilling, gjenoppretting));
9696

9797
StepVerifier.create(dashboardService.getPersonerStatus())
@@ -102,31 +102,10 @@ void shouldCountNyeByGjenopprettstatusNYBESTILLING() {
102102
.verifyComplete();
103103
}
104104

105-
@Test
106-
void shouldCountPdlFeilByPdlstatusFEIL() {
107-
var feil = fragment(DATE_1, 3L, "NYBESTILLING", "FEIL", "OK");
108-
var ok = fragment(DATE_1, 2L, "NYBESTILLING", "OK", "OK");
109-
when(bestillingRepository.findBestillingerOrderBySistOppdatert()).thenReturn(Flux.just(feil, ok));
110-
111-
StepVerifier.create(dashboardService.getPersonerStatus())
112-
.assertNext(dto -> assertThat(dto.getPdlFeil()).isEqualTo(3L))
113-
.verifyComplete();
114-
}
115-
116-
@Test
117-
void shouldCountAndreFeilByAnnenstatusFEIL() {
118-
var feil = fragment(DATE_1, 7L, "NYBESTILLING", "OK", "FEIL");
119-
when(bestillingRepository.findBestillingerOrderBySistOppdatert()).thenReturn(Flux.just(feil));
120-
121-
StepVerifier.create(dashboardService.getPersonerStatus())
122-
.assertNext(dto -> assertThat(dto.getAndreFeil()).isEqualTo(7L))
123-
.verifyComplete();
124-
}
125-
126105
@Test
127106
void shouldGroupFragmentsByDateIntoSeparateDtos() {
128-
var d1 = fragment(DATE_1, 10L, "NYBESTILLING", "OK", "OK");
129-
var d2 = fragment(DATE_2, 5L, "NYBESTILLING", "OK", "OK");
107+
var d1 = fragment(DATE_1, 10L, "NYBESTILLING");
108+
var d2 = fragment(DATE_2, 5L, "NYBESTILLING");
130109
when(bestillingRepository.findBestillingerOrderBySistOppdatert()).thenReturn(Flux.just(d1, d2));
131110

132111
StepVerifier.create(dashboardService.getPersonerStatus())
@@ -137,8 +116,8 @@ void shouldGroupFragmentsByDateIntoSeparateDtos() {
137116

138117
@Test
139118
void shouldSortPersonerStatusByDateDescending() {
140-
var d1 = fragment(DATE_1, 1L, "NYBESTILLING", "OK", "OK");
141-
var d2 = fragment(DATE_2, 1L, "NYBESTILLING", "OK", "OK");
119+
var d1 = fragment(DATE_1, 1L, "NYBESTILLING");
120+
var d2 = fragment(DATE_2, 1L, "NYBESTILLING");
142121
when(bestillingRepository.findBestillingerOrderBySistOppdatert()).thenReturn(Flux.just(d1, d2));
143122

144123
StepVerifier.create(dashboardService.getPersonerStatus())
@@ -149,15 +128,13 @@ void shouldSortPersonerStatusByDateDescending() {
149128

150129
@Test
151130
void shouldProduceZeroCountsWhenNoMatchingStatuses() {
152-
var f = fragment(DATE_1, 5L, "UKJENT", "UKJENT", "UKJENT");
131+
var f = fragment(DATE_1, 5L, "UKJENT");
153132
when(bestillingRepository.findBestillingerOrderBySistOppdatert()).thenReturn(Flux.just(f));
154133

155134
StepVerifier.create(dashboardService.getPersonerStatus())
156135
.assertNext(dto -> {
157136
assertThat(dto.getNye()).isZero();
158137
assertThat(dto.getGjenopprettede()).isZero();
159-
assertThat(dto.getPdlFeil()).isZero();
160-
assertThat(dto.getAndreFeil()).isZero();
161138
})
162139
.verifyComplete();
163140
}
@@ -619,15 +596,11 @@ void shouldSortPerioderOversiktByAarManedDescending() {
619596
// ── helpers ──────────────────────────────────────────────────────────────
620597

621598
private static BestillingerFragment fragment(LocalDate dato, Long personer,
622-
String gjenopprettstatus,
623-
String pdlstatus,
624-
String annenstatus) {
599+
String gjenopprettstatus) {
625600
return BestillingerFragment.builder()
626601
.dato(dato)
627602
.personer(personer)
628603
.gjenopprettstatus(gjenopprettstatus)
629-
.pdlstatus(pdlstatus)
630-
.annenstatus(annenstatus)
631604
.build();
632605
}
633606

0 commit comments

Comments
 (0)
⚡