From 60353d5a121f3062b118d7c4d905e0a3b3235a68 Mon Sep 17 00:00:00 2001 From: Movafagh Date: Mon, 8 Jul 2024 11:46:55 +0200 Subject: [PATCH] Fikset noen avhengigheter++ --- .../common/auditing/domain/AuditVersion.java | 5 +- .../auditing/event/EventController.java | 1 - .../data/common/validator/FieldValidator.java | 4 +- .../polly/codelist/CodelistController.java | 11 ++-- .../data/polly/codelist/CodelistService.java | 54 ++----------------- .../polly/codelist/CodelistStaticService.java | 49 +++++++++++++++++ .../codelist/codeusage/CodeUsageService.java | 4 +- .../data/polly/codelist/domain/Codelist.java | 9 ---- .../polly/codelist/dto/CodelistRequest.java | 12 ++++- .../dto/CodelistRequestValidator.java | 1 - .../polly/codelist/dto/CodelistResponse.java | 20 +++++++ .../polly/dashboard/DashboardController.java | 4 +- .../polly/disclosure/domain/Disclosure.java | 8 +-- .../data/polly/document/domain/Document.java | 4 +- .../polly/document/dto/DocumentResponse.java | 4 +- .../data/polly/export/ExportController.java | 4 +- .../nav/data/polly/export/ProcessToDocx.java | 8 +-- .../InformationTypeRepositoryImpl.java | 4 +- .../domain/InformationType.java | 4 +- .../domain/InformationTypeData.java | 4 +- .../dto/InformationTypeResponse.java | 10 ++-- .../polly/legalbasis/domain/LegalBasis.java | 6 +-- .../nav/data/polly/policy/domain/Policy.java | 2 +- .../polly/process/ProcessReadController.java | 6 +-- .../data/polly/process/domain/Process.java | 8 +-- .../process/domain/repo/ProcessCount.java | 4 +- .../process/domain/repo/ProcessVeryShort.java | 4 +- .../polly/process/domain/sub/Affiliation.java | 10 ++-- .../process/dpprocess/domain/DpProcess.java | 4 +- .../polly/processor/domain/ProcessorData.java | 4 +- .../polly/teams/dto/ProductAreaResponse.java | 1 - .../codelist/CodelistControllerTest.java | 10 ++-- .../CodelistRequestValidatorTest.java | 4 +- .../polly/codelist/CodelistServiceTest.java | 18 +++---- .../data/polly/codelist/CodelistUtils.java | 4 ++ .../nav/data/polly/IntegrationTestBase.java | 13 ++--- .../polly/codelist/CodeUsageControllerIT.java | 52 +++++++++--------- .../polly/codelist/CodelistControllerIT.java | 25 ++++----- .../disclosure/DisclosureControllerIT.java | 10 ++-- .../polly/document/DocumentControllerIT.java | 7 +-- .../polly/process/ProcessControllerIT.java | 10 ++-- .../dpprocess/DpProcessControllerIT.java | 4 +- .../processor/ProcessorControllerIT.java | 4 +- 43 files changed, 229 insertions(+), 205 deletions(-) create mode 100644 apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/CodelistStaticService.java diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/common/auditing/domain/AuditVersion.java b/apps/backend/polly-app/src/main/java/no/nav/data/common/auditing/domain/AuditVersion.java index 6f125327a..5100141fd 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/common/auditing/domain/AuditVersion.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/common/auditing/domain/AuditVersion.java @@ -13,10 +13,9 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.FieldNameConstants; -import no.nav.data.common.auditing.dto.AuditResponse; import no.nav.data.common.auditing.event.EventResponse; import no.nav.data.common.utils.JsonUtils; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.Codelist; import no.nav.data.polly.codelist.domain.ListName; import no.nav.data.polly.policy.domain.Policy; @@ -110,7 +109,7 @@ private List getPurposes(JsonNode json) { var purposes = purposesNewFormat.isEmpty() ? Optional.ofNullable(json.get("purposeCode")).map(JsonNode::textValue).map(List::of).orElse(List.of()) : purposesNewFormat; return purposes.stream() .map(purpose -> { - Codelist codelist = CodelistService.getCodelist(ListName.PURPOSE, purpose); + Codelist codelist = CodelistStaticService.getCodelist(ListName.PURPOSE, purpose); return codelist == null ? purpose : codelist.getShortName(); }) .collect(Collectors.toList()); diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/common/auditing/event/EventController.java b/apps/backend/polly-app/src/main/java/no/nav/data/common/auditing/event/EventController.java index b2123ca2d..d56a109da 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/common/auditing/event/EventController.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/common/auditing/event/EventController.java @@ -22,7 +22,6 @@ import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/common/validator/FieldValidator.java b/apps/backend/polly-app/src/main/java/no/nav/data/common/validator/FieldValidator.java index 13e41ac36..f181849cb 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/common/validator/FieldValidator.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/common/validator/FieldValidator.java @@ -1,6 +1,6 @@ package no.nav.data.common.validator; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.ListName; import org.apache.commons.lang3.EnumUtils; import org.apache.commons.lang3.StringUtils; @@ -136,7 +136,7 @@ public void checkCodelist(String fieldName, String fieldValue, ListName listName } private void checkCode(String fieldName, String fieldValue, ListName listName) { - if (CodelistService.getCodelist(listName, fieldValue) == null) { + if (CodelistStaticService.getCodelist(listName, fieldValue) == null) { validationErrors.add(new ValidationError(reference, ERROR_TYPE_CODELIST, String.format(ERROR_MESSAGE_CODELIST, getFieldName(fieldName), fieldValue, listName))); } } diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/CodelistController.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/CodelistController.java index 55d0d80a4..7476bd5d3 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/CodelistController.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/CodelistController.java @@ -35,6 +35,7 @@ import java.util.List; import java.util.stream.Collectors; +import static no.nav.data.common.utils.StreamUtils.convert; import static no.nav.data.common.utils.StringUtils.toUpperCaseAndTrim; @Slf4j @@ -56,7 +57,7 @@ public AllCodelistResponse findAll(@RequestParam(value = "refresh", required = f if (refresh) { service.refreshCache(); } - return new AllCodelistResponse(CodelistService.getAll().stream().map(Codelist::convertToResponse).collect(Collectors.groupingBy(CodelistResponse::getList))); + return new AllCodelistResponse(CodelistStaticService.getAll().stream().map(CodelistResponse::buildFrom).collect(Collectors.groupingBy(CodelistResponse::getList))); } @Operation(summary = "Get codes and descriptions for listName") @@ -66,7 +67,7 @@ public List getByListName(@PathVariable String listName) { String listUpper = toUpperCaseAndTrim(listName); log.info("Received a request for all codelists with listName={}", listUpper); requestValidator.validateListName(listUpper); - return CodelistService.getCodelistResponseList(ListName.valueOf(listUpper)); + return CodelistResponse.convertToCodelistResponses(CodelistStaticService.getCodelists(ListName.valueOf(listUpper))); } @Operation(summary = "Get for code in listName") @@ -77,7 +78,7 @@ public CodelistResponse getByListNameAndCode(@PathVariable String listName, @Pat String codeUpper = toUpperCaseAndTrim(code); log.info("Received a request for the codelist with the code={} in listName={}", codeUpper, listUpper); requestValidator.validateListNameAndCode(listUpper, codeUpper); - return CodelistService.getCodelistResponse(ListName.valueOf(listUpper), codeUpper); + return CodelistStaticService.getCodelistResponse(ListName.valueOf(listUpper), codeUpper); } @Operation(summary = "Create Codelist") @@ -89,7 +90,7 @@ public List save(@Valid @RequestBody List req requests = StreamUtils.nullToEmptyList(requests); requestValidator.validateRequest(requests, false); - return service.save(requests).stream().map(Codelist::convertToResponse).collect(Collectors.toList()); + return CodelistResponse.convertToCodelistResponses(service.save(CodelistRequest.convertToCodelists(requests))); } @Operation(summary = "Update Codelist") @@ -100,7 +101,7 @@ public List update(@Valid @RequestBody List r requests = StreamUtils.nullToEmptyList(requests); requestValidator.validateRequest(requests, true); - return service.update(requests).stream().map(Codelist::convertToResponse).collect(Collectors.toList()); + return CodelistResponse.convertToCodelistResponses(service.update(requests)); } @Operation(summary = "Delete Codelist") diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/CodelistService.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/CodelistService.java index c0d4d47c4..53aa626ce 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/CodelistService.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/CodelistService.java @@ -7,70 +7,26 @@ import no.nav.data.polly.codelist.domain.ListName; import no.nav.data.polly.codelist.dto.CodelistRequest; import no.nav.data.polly.codelist.dto.CodelistRequestValidator; -import no.nav.data.polly.codelist.dto.CodelistResponse; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Service; +import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; -import java.util.Collection; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import static no.nav.data.common.utils.StreamUtils.convert; - @Slf4j @Lazy(false) -@Service // Likevel, tjenestene som tilbys her har state (gjennom CodelistCache) +@Component @RequiredArgsConstructor public class CodelistService implements InitializingBean { private final CodelistRepository codelistRepository; private final CodelistRequestValidator codelistRequestValidator; // TODO: Avhengighet utover - // TODO: Denne skal ikke være static - public static Codelist getCodelist(ListName listName, String code) { - return CodelistCache.getCodelist(listName, code); - } - - // TODO: Snu avhengigheten innover - // TODO: Denne skal ikke være static - public static CodelistResponse getCodelistResponse(ListName listName, String code) { - if (code == null) { - return null; - } - Codelist codelist = getCodelist(listName, code); - if (codelist == null) { - return new CodelistResponse(listName, code, null, null); - } - return codelist.convertToResponse(); - } - - // TODO: Snu avhengigheten innover - // TODO: Denne skal ikke være static - public static List getCodelistResponseList(ListName listName) { - return convert(CodelistCache.getCodelist(listName), Codelist::convertToResponse); - } - - // TODO: Snu avhengigheten innover - // TODO: Denne skal ikke være static - public static List getCodelistResponseList(ListName listName, Collection codes) { - return convert(codes, code -> getCodelistResponse(listName, code)); - } - - // TODO: Denne skal ikke være static - public static List getCodelist(ListName name) { - return CodelistCache.getCodelist(name); - } - - // TODO: Denne skal ikke være static - public static List getAll() { - return CodelistCache.getAll(); - } - @Scheduled(initialDelayString = "PT1M", fixedRateString = "PT1M") @Transactional public void refreshCache() { @@ -79,12 +35,8 @@ public void refreshCache() { CodelistCache.init(cache -> allCodelists.forEach(cache::setCode)); } - // TODO: Snu avhengigheten innover @Transactional - public List save(List requests) { - List codelists = requests.stream() - .map(CodelistRequest::convert) - .collect(Collectors.toList()); + public List save(List codelists) { List saved = codelistRepository.saveAll(codelists); saved.forEach(CodelistCache::set); return saved; diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/CodelistStaticService.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/CodelistStaticService.java new file mode 100644 index 000000000..44207f5fe --- /dev/null +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/CodelistStaticService.java @@ -0,0 +1,49 @@ +package no.nav.data.polly.codelist; + +import no.nav.data.polly.codelist.domain.Codelist; +import no.nav.data.polly.codelist.domain.ListName; +import no.nav.data.polly.codelist.dto.CodelistResponse; + +import java.util.Collection; +import java.util.List; + +import static no.nav.data.common.utils.StreamUtils.convert; + +@Deprecated // TODO: Skal fjernes (midlertidig hjem for alt som var static i CodelistService) +public final class CodelistStaticService { + + private CodelistStaticService() {} + + public static Codelist getCodelist(ListName listName, String code) { + return CodelistCache.getCodelist(listName, code); + } + + public static CodelistResponse getCodelistResponse(ListName listName, String code) { + if (code == null) { + return null; + } + Codelist codelist = getCodelist(listName, code); + if (codelist == null) { + return new CodelistResponse(listName, code, null, null); + } + return CodelistResponse.buildFrom(codelist); + } + + public static List getCodelists(ListName listName) { + return CodelistCache.getCodelist(listName); + } + + // TODO: Snu avhengigheten innover + public static List getCodelistResponseList(ListName listName, Collection codes) { + return convert(codes, code -> getCodelistResponse(listName, code)); + } + + public static List getCodelist(ListName name) { + return CodelistCache.getCodelist(name); + } + + public static List getAll() { + return CodelistCache.getAll(); + } + +} \ No newline at end of file diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/codeusage/CodeUsageService.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/codeusage/CodeUsageService.java index ad59b1eae..2719ad376 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/codeusage/CodeUsageService.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/codeusage/CodeUsageService.java @@ -2,7 +2,7 @@ import io.prometheus.client.Summary; import no.nav.data.common.utils.MetricUtils; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.ListName; import no.nav.data.polly.codelist.dto.CodeUsageRequest; import no.nav.data.polly.codelist.dto.CodeUsageResponse; @@ -89,7 +89,7 @@ void validateRequests(List requests) { } public List findCodeUsageOfList(ListName list) { - return CodelistService.getCodelist(list).stream().map(c -> findCodeUsage(c.getList(), c.getCode())).collect(toList()); + return CodelistStaticService.getCodelist(list).stream().map(c -> findCodeUsage(c.getList(), c.getCode())).collect(toList()); } public CodeUsageResponse findCodeUsage(ListName listName, String code) { diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/domain/Codelist.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/domain/Codelist.java index f4faca70d..2e609539b 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/domain/Codelist.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/domain/Codelist.java @@ -44,15 +44,6 @@ public class Codelist extends Auditable { @Column(name = "DESCRIPTION") private String description; - public CodelistResponse convertToResponse() { - return CodelistResponse.builder() - .list(list) - .code(code) - .shortName(shortName) - .description(description) - .build(); - } - @Override public UUID getId() { throw new NotImplementedException("does not apply"); diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/dto/CodelistRequest.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/dto/CodelistRequest.java index 938b82de6..95a7d2b33 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/dto/CodelistRequest.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/dto/CodelistRequest.java @@ -12,6 +12,9 @@ import no.nav.data.polly.codelist.domain.ListName; import org.apache.commons.lang3.StringUtils; +import java.util.List; +import java.util.stream.Collectors; + import static no.nav.data.common.utils.StringUtils.toUpperCaseAndTrim; @Data @@ -29,7 +32,7 @@ public class CodelistRequest implements RequestElement { private boolean update; private int requestIndex; - public Codelist convert() { + public Codelist convertToCodelist() { return Codelist.builder() .list(ListName.valueOf(list)) .code(code) @@ -37,6 +40,13 @@ public Codelist convert() { .description(description) .build(); } + + public static List convertToCodelists(List requests) { + return requests.stream() + .map(CodelistRequest::convertToCodelist) + .collect(Collectors.toList()); + } + @JsonIgnore @Override diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/dto/CodelistRequestValidator.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/dto/CodelistRequestValidator.java index 25cea428c..4380fc579 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/dto/CodelistRequestValidator.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/dto/CodelistRequestValidator.java @@ -1,6 +1,5 @@ package no.nav.data.polly.codelist.dto; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import no.nav.data.common.exceptions.CodelistNotErasableException; import no.nav.data.common.utils.StreamUtils; diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/dto/CodelistResponse.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/dto/CodelistResponse.java index d7e11c3e5..18778add4 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/dto/CodelistResponse.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/codelist/dto/CodelistResponse.java @@ -7,8 +7,13 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import no.nav.data.common.utils.StreamUtils; +import no.nav.data.polly.codelist.domain.Codelist; import no.nav.data.polly.codelist.domain.ListName; +import java.util.Collection; +import java.util.List; + @Data @Builder @NoArgsConstructor @@ -30,4 +35,19 @@ public String toString() { public Boolean isInvalidCode() { return description == null ? Boolean.TRUE : null; } + + public static CodelistResponse buildFrom(Codelist cl) { + return CodelistResponse.builder() + .list(cl.getList()) + .code(cl.getCode()) + .shortName(cl.getShortName()) + .description(cl.getDescription()) + .build(); + } + + public static List convertToCodelistResponses(Collection codelists) { + return StreamUtils.convert(codelists, CodelistResponse::buildFrom); + } + + } diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/dashboard/DashboardController.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/dashboard/DashboardController.java index 9a391d9f5..c1425329c 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/dashboard/DashboardController.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/dashboard/DashboardController.java @@ -9,7 +9,7 @@ import no.nav.data.common.storage.domain.GenericStorage; import no.nav.data.polly.alert.domain.AlertEvent; import no.nav.data.polly.alert.domain.AlertRepository; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.ListName; import no.nav.data.polly.dashboard.dto.DashResponse; import no.nav.data.polly.dashboard.dto.DashResponse.Counter; @@ -78,7 +78,7 @@ public ResponseEntity getDashboardData(@RequestParam(value = "filt private DashResponse calcDash(ProcessStatusFilter filter) { var dash = new DashResponse(); // init all departments and load teamId -> productArea mapping - CodelistService.getCodelist(ListName.DEPARTMENT).forEach(d -> dash.department(d.getCode())); + CodelistStaticService.getCodelist(ListName.DEPARTMENT).forEach(d -> dash.department(d.getCode())); teamService.getAllTeams().forEach(t -> dash.registerTeam(t.getId(), t.getProductAreaId())); doPaged(processRepository, 50, processes -> { diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/disclosure/domain/Disclosure.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/disclosure/domain/Disclosure.java index 9c0263363..fa69d0b49 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/disclosure/domain/Disclosure.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/disclosure/domain/Disclosure.java @@ -14,7 +14,7 @@ import lombok.NoArgsConstructor; import no.nav.data.common.auditing.domain.Auditable; import no.nav.data.common.utils.DateUtil; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.ListName; import no.nav.data.polly.codelist.dto.UsedInInstance; import no.nav.data.polly.disclosure.dto.DisclosureAbroadResponse; @@ -83,7 +83,7 @@ public DisclosureResponse convertToResponse() { .id(id) .name(data.getName()) .description(data.getDescription()) - .recipient(CodelistService.getCodelistResponse(ListName.THIRD_PARTY, data.getRecipient())) + .recipient(CodelistStaticService.getCodelistResponse(ListName.THIRD_PARTY, data.getRecipient())) .recipientPurpose(data.getRecipientPurpose()) .legalBases(convert(data.getLegalBases(), LegalBasis::convertToResponse)) .start(data.getStart()) @@ -96,7 +96,7 @@ public DisclosureResponse convertToResponse() { .thirdCountryReceiver(data.getThirdCountryReceiver()) .assessedConfidentiality(data.getAssessedConfidentiality()) .confidentialityDescription(data.getConfidentialityDescription()) - .department(CodelistService.getCodelistResponse(ListName.DEPARTMENT, data.getDepartment())) + .department(CodelistStaticService.getCodelistResponse(ListName.DEPARTMENT, data.getDepartment())) .productTeams(copyOf(data.getProductTeams())) .changeStamp(convertChangeStampResponse()) .build(); @@ -110,7 +110,7 @@ public DisclosureSummaryResponse convertToSummary(List process return DisclosureSummaryResponse.builder() .id(id) .name(data.getName()) - .recipient(CodelistService.getCodelistResponse(ListName.THIRD_PARTY, data.getRecipient())) + .recipient(CodelistStaticService.getCodelistResponse(ListName.THIRD_PARTY, data.getRecipient())) .processes(convert(processes, ProcessVeryShort::toResponse)) .legalBases(data.getLegalBases().size()) .build(); diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/document/domain/Document.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/document/domain/Document.java index 3d5ce0f33..1e4da8d14 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/document/domain/Document.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/document/domain/Document.java @@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import no.nav.data.common.auditing.domain.Auditable; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.ListName; import no.nav.data.polly.codelist.dto.UsedInInstance; import no.nav.data.polly.document.dto.DocumentInfoTypeUseResponse; @@ -63,7 +63,7 @@ public Document convertFromRequest(DocumentRequest request) { public static DocumentInfoTypeUseResponse convertToInfoTypeUseResponse(DocumentData.InformationTypeUse informationTypeUse) { return DocumentInfoTypeUseResponse.builder() .informationTypeId(informationTypeUse.getInformationTypeId()) - .subjectCategories(CodelistService.getCodelistResponseList(ListName.SUBJECT_CATEGORY, informationTypeUse.getSubjectCategories())) + .subjectCategories(CodelistStaticService.getCodelistResponseList(ListName.SUBJECT_CATEGORY, informationTypeUse.getSubjectCategories())) .build(); } diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/document/dto/DocumentResponse.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/document/dto/DocumentResponse.java index aaae0cb8f..0e04af78d 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/document/dto/DocumentResponse.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/document/dto/DocumentResponse.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.Singular; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.ListName; import no.nav.data.polly.codelist.dto.CodelistResponse; import no.nav.data.polly.document.domain.Document; @@ -38,7 +38,7 @@ public static DocumentResponse buildFrom(Document d) { .name(data.getName()) .description(data.getDescription()) .informationTypes(convert(data.getInformationTypes(), Document::convertToInfoTypeUseResponse)) - .dataAccessClass(CodelistService.getCodelistResponse(ListName.DATA_ACCESS_CLASS, data.getDataAccessClass())) + .dataAccessClass(CodelistStaticService.getCodelistResponse(ListName.DATA_ACCESS_CLASS, data.getDataAccessClass())) .build(); } diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/export/ExportController.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/export/ExportController.java index ff17ac41a..151cc462c 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/export/ExportController.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/export/ExportController.java @@ -11,7 +11,7 @@ import lombok.SneakyThrows; import no.nav.data.common.exceptions.NotFoundException; import no.nav.data.common.exceptions.ValidationException; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.ListName; import no.nav.data.polly.codelist.dto.CodelistRequestValidator; import no.nav.data.polly.export.domain.DocumentAccess; @@ -128,7 +128,7 @@ public void getExport( } private String cleanCodelistName(ListName listName, String codelist) { - return CodelistService.getCodelist(listName, codelist).getShortName().replaceAll("[^a-zA-Z\\d]", "-"); + return CodelistStaticService.getCodelist(listName, codelist).getShortName().replaceAll("[^a-zA-Z\\d]", "-"); } } diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/export/ProcessToDocx.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/export/ProcessToDocx.java index 6147c08c7..30524eb1b 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/export/ProcessToDocx.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/export/ProcessToDocx.java @@ -7,7 +7,7 @@ import no.nav.data.common.utils.StreamUtils; import no.nav.data.polly.alert.AlertService; import no.nav.data.polly.alert.dto.PolicyAlert; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.commoncode.CommonCodeService; import no.nav.data.polly.codelist.commoncode.dto.CommonCodeResponse; import no.nav.data.polly.codelist.domain.Codelist; @@ -182,7 +182,7 @@ public byte[] generateDocFor(ListName list, String code, DocumentAccess document processes = getProcesses(processes, documentAccess); - Codelist codelist = CodelistService.getCodelist(list, code); + Codelist codelist = CodelistStaticService.getCodelist(list, code); var doc = new DocumentBuilder(); doc.addTitle(title + ": " + codelist.getShortName()); doc.addText("Eksportert " + formatter.format(date)); @@ -240,7 +240,7 @@ public void generate(Process process, DocumentAccess documentAccess) { data.getPurposes().forEach(purpose -> { addHeading4("Overordnet formål: " + shortName(ListName.PURPOSE, purpose)); - addText(CodelistService.getCodelist(ListName.PURPOSE, purpose).getDescription()); + addText(CodelistStaticService.getCodelist(ListName.PURPOSE, purpose).getDescription()); }); addHeading4("Formål med behandlingen"); @@ -698,7 +698,7 @@ private static String shortNames(ListName listName, List codes) { } private static String shortName(ListName listName, String code) { - return code == null ? "" : CodelistService.getCodelist(listName, code).getShortName(); + return code == null ? "" : CodelistStaticService.getCodelist(listName, code).getShortName(); } private static String processStatusText(ProcessData data) { diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/informationtype/InformationTypeRepositoryImpl.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/informationtype/InformationTypeRepositoryImpl.java index 93131264c..32a458dbb 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/informationtype/InformationTypeRepositoryImpl.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/informationtype/InformationTypeRepositoryImpl.java @@ -1,6 +1,6 @@ package no.nav.data.polly.informationtype; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.ListName; import no.nav.data.polly.informationtype.domain.InformationType; import no.nav.data.polly.informationtype.dto.InformationTypeShortResponse; @@ -63,7 +63,7 @@ public List findAllShort() { (rs, rowNum) -> InformationTypeShortResponse.builder() .id(UUID.fromString(rs.getString(1))) .name(rs.getString(2)) - .sensitivity(CodelistService.getCodelistResponse(ListName.SENSITIVITY, rs.getString(3))) + .sensitivity(CodelistStaticService.getCodelistResponse(ListName.SENSITIVITY, rs.getString(3))) .build()); } diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/informationtype/domain/InformationType.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/informationtype/domain/InformationType.java index b2cd7ae7f..874735bbc 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/informationtype/domain/InformationType.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/informationtype/domain/InformationType.java @@ -15,7 +15,7 @@ import lombok.NoArgsConstructor; import lombok.ToString; import no.nav.data.common.auditing.domain.Auditable; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.ListName; import no.nav.data.polly.codelist.dto.UsedInInstance; import no.nav.data.polly.informationtype.dto.InformationTypeRequest; @@ -75,7 +75,7 @@ public InformationTypeResponse convertToResponse() { // TODO: Snu avhengigheten innover public InformationTypeShortResponse convertToShortResponse() { - return new InformationTypeShortResponse(getId(), getData().getName(), CodelistService.getCodelistResponse(ListName.SENSITIVITY, data.getSensitivity())); + return new InformationTypeShortResponse(getId(), getData().getName(), CodelistStaticService.getCodelistResponse(ListName.SENSITIVITY, data.getSensitivity())); } public UsedInInstance getInstanceIdentification() { diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/informationtype/domain/InformationTypeData.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/informationtype/domain/InformationTypeData.java index c5055654f..e296b3b8c 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/informationtype/domain/InformationTypeData.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/informationtype/domain/InformationTypeData.java @@ -6,7 +6,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.ListName; import no.nav.data.polly.codelist.dto.CodelistResponse; @@ -33,7 +33,7 @@ public class InformationTypeData { private String suggest; public CodelistResponse sensitivityCode() { - return CodelistService.getCodelistResponse(ListName.SENSITIVITY, sensitivity); + return CodelistStaticService.getCodelistResponse(ListName.SENSITIVITY, sensitivity); } @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/informationtype/dto/InformationTypeResponse.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/informationtype/dto/InformationTypeResponse.java index e08e51a24..035978cff 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/informationtype/dto/InformationTypeResponse.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/informationtype/dto/InformationTypeResponse.java @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; import lombok.Singular; import no.nav.data.common.rest.ChangeStampResponse; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.ListName; import no.nav.data.polly.codelist.dto.CodelistResponse; import no.nav.data.polly.informationtype.domain.InformationType; @@ -50,11 +50,11 @@ public InformationTypeResponse(InformationType informationType) { private void mapJsonFields(@NotNull InformationTypeData data) { setName(data.getName()); setDescription(data.getDescription()); - setSensitivity(CodelistService.getCodelistResponse(ListName.SENSITIVITY, data.getSensitivity())); - setOrgMaster(CodelistService.getCodelistResponse(ListName.SYSTEM, data.getOrgMaster())); + setSensitivity(CodelistStaticService.getCodelistResponse(ListName.SENSITIVITY, data.getSensitivity())); + setOrgMaster(CodelistStaticService.getCodelistResponse(ListName.SYSTEM, data.getOrgMaster())); setProductTeams(copyOf(data.getProductTeams())); - setCategories(CodelistService.getCodelistResponseList(ListName.CATEGORY, data.getCategories())); - setSources(CodelistService.getCodelistResponseList(ListName.THIRD_PARTY, data.getSources())); + setCategories(CodelistStaticService.getCodelistResponseList(ListName.CATEGORY, data.getCategories())); + setSources(CodelistStaticService.getCodelistResponseList(ListName.THIRD_PARTY, data.getSources())); setKeywords(copyOf(data.getKeywords())); } diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/legalbasis/domain/LegalBasis.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/legalbasis/domain/LegalBasis.java index a6bbb21b9..506455441 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/legalbasis/domain/LegalBasis.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/legalbasis/domain/LegalBasis.java @@ -5,7 +5,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.ListName; import no.nav.data.polly.codelist.dto.CodelistResponse; import no.nav.data.polly.legalbasis.dto.LegalBasisResponse; @@ -28,11 +28,11 @@ public LegalBasisResponse convertToResponse() { } private CodelistResponse gdprCodelistResponse() { - return CodelistService.getCodelistResponse(ListName.GDPR_ARTICLE, gdpr); + return CodelistStaticService.getCodelistResponse(ListName.GDPR_ARTICLE, gdpr); } private CodelistResponse nationalLawCodelistResponse() { - return CodelistService.getCodelistResponse(ListName.NATIONAL_LAW, nationalLaw); + return CodelistStaticService.getCodelistResponse(ListName.NATIONAL_LAW, nationalLaw); } } \ No newline at end of file diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/policy/domain/Policy.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/policy/domain/Policy.java index 4c5b0a5e0..6e595d083 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/policy/domain/Policy.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/policy/domain/Policy.java @@ -35,7 +35,7 @@ import java.util.UUID; import static no.nav.data.common.utils.StreamUtils.convert; -import static no.nav.data.polly.codelist.CodelistService.getCodelistResponseList; +import static no.nav.data.polly.codelist.CodelistStaticService.getCodelistResponseList; @Data @Builder diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/process/ProcessReadController.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/process/ProcessReadController.java index b399e9f72..9cef5e02e 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/process/ProcessReadController.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/process/ProcessReadController.java @@ -16,7 +16,7 @@ import no.nav.data.common.security.SecurityUtils; import no.nav.data.common.security.dto.UserInfo; import no.nav.data.common.utils.JsonUtils; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.Codelist; import no.nav.data.polly.codelist.domain.ListName; import no.nav.data.polly.process.domain.Process; @@ -148,7 +148,7 @@ public ResponseEntity> getProcessesByInformati @Transactional // TODO: Flytt til tjenestelaget public ResponseEntity> getPurpose(@PathVariable String purpose) { log.info("Get processes for purpose={}", purpose); - Codelist codelist = CodelistService.getCodelist(ListName.PURPOSE, purpose); + Codelist codelist = CodelistStaticService.getCodelist(ListName.PURPOSE, purpose); if (codelist == null) { return ResponseEntity.notFound().build(); } @@ -197,7 +197,7 @@ public ResponseEntity> searchProcesses(@PathVa repository.searchByProcessNumber(search).ifPresent(processes::addAll); } if (includePurpose) { - var purposes = filter(CodelistService.getCodelist(ListName.PURPOSE), c -> StringUtils.containsIgnoreCase(c.getShortName(), search)); + var purposes = filter(CodelistStaticService.getCodelist(ListName.PURPOSE), c -> StringUtils.containsIgnoreCase(c.getShortName(), search)); purposes.sort(comparing(Codelist::getShortName, startsWith(search))); if (!purposes.isEmpty()) { processes.addAll(repository.findByPurpose(purposes.get(0).getCode())); diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/process/domain/Process.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/process/domain/Process.java index a55835148..c8e5179f6 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/process/domain/Process.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/process/domain/Process.java @@ -16,7 +16,7 @@ import no.nav.data.common.auditing.domain.Auditable; import no.nav.data.common.rest.ChangeStampResponse; import no.nav.data.common.utils.DateUtil; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.ListName; import no.nav.data.polly.codelist.dto.CodelistResponse; import no.nav.data.polly.legalbasis.domain.LegalBasis; @@ -163,12 +163,14 @@ public ProcessShortResponse convertToShortResponse() { .build(); } + // TODO: Snu avhengigheten innover public List getPurposeCodeResponses() { - return CodelistService.getCodelistResponseList(ListName.PURPOSE, data.getPurposes()); + return CodelistStaticService.getCodelistResponseList(ListName.PURPOSE, data.getPurposes()); } + // TODO: Snu avhengigheten innover private CodelistResponse getCommonExternalProcessResponsibleCodeResponse() { - return CodelistService.getCodelistResponse(ListName.THIRD_PARTY, data.getCommonExternalProcessResponsible()); + return CodelistStaticService.getCodelistResponse(ListName.THIRD_PARTY, data.getCommonExternalProcessResponsible()); } @Override diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/process/domain/repo/ProcessCount.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/process/domain/repo/ProcessCount.java index e96ed31f6..0e9cfac5d 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/process/domain/repo/ProcessCount.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/process/domain/repo/ProcessCount.java @@ -1,6 +1,6 @@ package no.nav.data.polly.process.domain.repo; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.ListName; import java.util.List; @@ -36,6 +36,6 @@ static Map countToMap(List counts, ListName listName } static void fillCountsWithZero(Map counts, ListName listName) { - CodelistService.getCodelist(listName).stream().filter(c -> !counts.containsKey(c.getCode())).forEach(c -> counts.put(c.getCode(), 0L)); + CodelistStaticService.getCodelist(listName).stream().filter(c -> !counts.containsKey(c.getCode())).forEach(c -> counts.put(c.getCode(), 0L)); } } diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/process/domain/repo/ProcessVeryShort.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/process/domain/repo/ProcessVeryShort.java index 4399a0ce3..e424b167f 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/process/domain/repo/ProcessVeryShort.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/process/domain/repo/ProcessVeryShort.java @@ -1,7 +1,7 @@ package no.nav.data.polly.process.domain.repo; import no.nav.data.common.utils.JsonUtils; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.ListName; import no.nav.data.polly.process.domain.sub.Affiliation; import no.nav.data.polly.process.dto.ProcessVeryShortResponse; @@ -25,7 +25,7 @@ public interface ProcessVeryShort { default ProcessVeryShortResponse toResponse() { var purposeCodes = JsonUtils.toObject(getPurposesJsonArray(), String[].class); var affiliationString = JsonUtils.toObject(getAffiliationJson(), Affiliation.class); - var purposes = CodelistService.getCodelistResponseList(ListName.PURPOSE, Arrays.asList(purposeCodes)); + var purposes = CodelistStaticService.getCodelistResponseList(ListName.PURPOSE, Arrays.asList(purposeCodes)); var affiliationResponse = AffiliationResponse.buildFrom(affiliationString); return ProcessVeryShortResponse.builder() diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/process/domain/sub/Affiliation.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/process/domain/sub/Affiliation.java index 39830773a..d351a092c 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/process/domain/sub/Affiliation.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/process/domain/sub/Affiliation.java @@ -4,7 +4,7 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.ListName; import no.nav.data.polly.codelist.dto.CodelistResponse; @@ -24,22 +24,22 @@ public class Affiliation { // TODO: Avhengighet utover public CodelistResponse getDepartmentCodeResponse() { - return CodelistService.getCodelistResponse(ListName.DEPARTMENT, getDepartment()); + return CodelistStaticService.getCodelistResponse(ListName.DEPARTMENT, getDepartment()); } // TODO: Avhengighet utover public List getSubDepartmentCodeResponses() { - return CodelistService.getCodelistResponseList(ListName.SUB_DEPARTMENT, getSubDepartments()); + return CodelistStaticService.getCodelistResponseList(ListName.SUB_DEPARTMENT, getSubDepartments()); } // TODO: Avhengighet utover public List getProductCodeResponses() { - return CodelistService.getCodelistResponseList(ListName.SYSTEM, getProducts()); + return CodelistStaticService.getCodelistResponseList(ListName.SYSTEM, getProducts()); } // TODO: Avhengighet utover public List getDisclosureDispatcherCodeResponses() { - return CodelistService.getCodelistResponseList(ListName.SYSTEM, getDisclosureDispatchers()); + return CodelistStaticService.getCodelistResponseList(ListName.SYSTEM, getDisclosureDispatchers()); } } diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/process/dpprocess/domain/DpProcess.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/process/dpprocess/domain/DpProcess.java index 9c8d9ad80..bb9242f71 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/process/dpprocess/domain/DpProcess.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/process/dpprocess/domain/DpProcess.java @@ -14,7 +14,7 @@ import lombok.NoArgsConstructor; import no.nav.data.common.auditing.domain.Auditable; import no.nav.data.common.utils.DateUtil; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.ListName; import no.nav.data.polly.codelist.dto.CodelistResponse; import no.nav.data.polly.process.domain.sub.Affiliation; @@ -100,7 +100,7 @@ public DpProcessResponse convertToResponse() { // TODO: Snu avhengigheten innover // TODO: Skal ikke ha kall til service her. private CodelistResponse getExternalProcessResponsibleCodeResponse() { - return CodelistService.getCodelistResponse(ListName.THIRD_PARTY, data.getExternalProcessResponsible()); + return CodelistStaticService.getCodelistResponse(ListName.THIRD_PARTY, data.getExternalProcessResponsible()); } // TODO: Snu avhengigheten innover diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/processor/domain/ProcessorData.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/processor/domain/ProcessorData.java index cc8fa2bb1..5b3122262 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/processor/domain/ProcessorData.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/processor/domain/ProcessorData.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.Singular; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.ListName; import no.nav.data.polly.codelist.dto.CodelistResponse; @@ -33,7 +33,7 @@ public class ProcessorData { // TODO: Snu avhengigheten innover public CodelistResponse getTransferGroundsOutsideEUCodeResponse() { - return CodelistService.getCodelistResponse(ListName.TRANSFER_GROUNDS_OUTSIDE_EU, getTransferGroundsOutsideEU()); + return CodelistStaticService.getCodelistResponse(ListName.TRANSFER_GROUNDS_OUTSIDE_EU, getTransferGroundsOutsideEU()); } } diff --git a/apps/backend/polly-app/src/main/java/no/nav/data/polly/teams/dto/ProductAreaResponse.java b/apps/backend/polly-app/src/main/java/no/nav/data/polly/teams/dto/ProductAreaResponse.java index 846fa7605..f133e8656 100644 --- a/apps/backend/polly-app/src/main/java/no/nav/data/polly/teams/dto/ProductAreaResponse.java +++ b/apps/backend/polly-app/src/main/java/no/nav/data/polly/teams/dto/ProductAreaResponse.java @@ -5,7 +5,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import no.nav.data.polly.teams.domain.Member; import no.nav.data.polly.teams.domain.ProductArea; import java.util.List; diff --git a/apps/backend/polly-test/polly-test-component/src/test/java/no/nav/data/polly/codelist/CodelistControllerTest.java b/apps/backend/polly-test/polly-test-component/src/test/java/no/nav/data/polly/codelist/CodelistControllerTest.java index 19ffb48ea..337a09c02 100644 --- a/apps/backend/polly-test/polly-test-component/src/test/java/no/nav/data/polly/codelist/CodelistControllerTest.java +++ b/apps/backend/polly-test/polly-test-component/src/test/java/no/nav/data/polly/codelist/CodelistControllerTest.java @@ -79,8 +79,8 @@ void findAll() throws Exception { assertThat(response.getStatus()).isEqualTo(HttpStatus.OK.value()); assertThat(returnedCodelist.getCodelist().size()).isEqualTo(ListName.values().length); - assertThat(returnedCodelist.getCodelist().get(ListName.THIRD_PARTY).size()).isEqualTo(CodelistService.getCodelist(ListName.THIRD_PARTY).size()); - assertThat(returnedCodelist.getCodelist().get(ListName.CATEGORY).size()).isEqualTo(CodelistService.getCodelist(ListName.CATEGORY).size()); + assertThat(returnedCodelist.getCodelist().get(ListName.THIRD_PARTY).size()).isEqualTo(CodelistStaticService.getCodelist(ListName.THIRD_PARTY).size()); + assertThat(returnedCodelist.getCodelist().get(ListName.CATEGORY).size()).isEqualTo(CodelistStaticService.getCodelist(ListName.CATEGORY).size()); } @Test @@ -91,7 +91,7 @@ void getByListName_shouldReturnCodelist() throws Exception { @SuppressWarnings("unchecked") List> mappedResponse = JsonUtils.toObject(response.getContentAsString(), ArrayList.class); - assertThat(mappedResponse).hasSize(CodelistService.getCodelist(ListName.THIRD_PARTY).size()); + assertThat(mappedResponse).hasSize(CodelistStaticService.getCodelist(ListName.THIRD_PARTY).size()); } @Test @@ -102,7 +102,7 @@ void getByListNameAndCode_shouldReturnForARBEIDSGIVER() throws Exception { .andExpect(status().isOk()) .andReturn().getResponse(); - assertThat(response.getContentAsString()).isEqualTo(JsonUtils.toJson(CodelistService.getCodelistResponse(ListName.THIRD_PARTY, "ARBEIDSGIVER"))); + assertThat(response.getContentAsString()).isEqualTo(JsonUtils.toJson(CodelistStaticService.getCodelistResponse(ListName.THIRD_PARTY, "ARBEIDSGIVER"))); } @Test @@ -149,7 +149,7 @@ void save_shouldSaveMultipleCodelists() throws Exception { .content(inputJson)) .andExpect(status().isCreated()) .andExpect(jsonPath("$.length()").value(2)); - verify(service).save(requests); + verify(service).save(CodelistRequest.convertToCodelists(requests)); } @Test diff --git a/apps/backend/polly-test/polly-test-component/src/test/java/no/nav/data/polly/codelist/CodelistRequestValidatorTest.java b/apps/backend/polly-test/polly-test-component/src/test/java/no/nav/data/polly/codelist/CodelistRequestValidatorTest.java index e28591a8b..12741d574 100644 --- a/apps/backend/polly-test/polly-test-component/src/test/java/no/nav/data/polly/codelist/CodelistRequestValidatorTest.java +++ b/apps/backend/polly-test/polly-test-component/src/test/java/no/nav/data/polly/codelist/CodelistRequestValidatorTest.java @@ -198,9 +198,9 @@ void validateThatAllFieldsHaveValidValues_shouldChangeInputInRequestToCorrectFor createCodelistRequest(" category ", " cOrRecTFormAT ", " name ", " Trim av description ")); when(repository.saveAll(anyList())).thenAnswer(AdditionalAnswers.returnsFirstArg()); requestValidator.validateRequest(requests, false); - service.save(requests); + service.save(CodelistRequest.convertToCodelists(requests)); assertTrue(CodelistCache.contains(ListName.CATEGORY, "CORRECTFORMAT")); - assertThat(service.getCodelist(ListName.CATEGORY, "CORRECTFORMAT").getDescription()).isEqualTo("Trim av description"); + assertThat(CodelistStaticService.getCodelist(ListName.CATEGORY, "CORRECTFORMAT").getDescription()).isEqualTo("Trim av description"); } } diff --git a/apps/backend/polly-test/polly-test-component/src/test/java/no/nav/data/polly/codelist/CodelistServiceTest.java b/apps/backend/polly-test/polly-test-component/src/test/java/no/nav/data/polly/codelist/CodelistServiceTest.java index 795f03bfb..84c7af805 100644 --- a/apps/backend/polly-test/polly-test-component/src/test/java/no/nav/data/polly/codelist/CodelistServiceTest.java +++ b/apps/backend/polly-test/polly-test-component/src/test/java/no/nav/data/polly/codelist/CodelistServiceTest.java @@ -9,11 +9,7 @@ import no.nav.data.polly.codelist.dto.CodelistRequest; import no.nav.data.polly.codelist.dto.CodelistRequestValidator; import no.nav.data.polly.process.dto.ProcessShortResponse; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.AdditionalAnswers; @@ -59,10 +55,10 @@ void init() { @Test void save_shouldSaveCodelist_whenRequestIsValid() { when(repository.saveAll(anyList())).thenAnswer(AdditionalAnswers.returnsFirstArg()); - service.save(List.of(createCodelistRequest("THIRD_PARTY", "TEST_CODE", "Test shortName", "Test description"))); + service.save(List.of(createCodelist(ListName.THIRD_PARTY, "TEST_CODE", "Test shortName", "Test description"))); verify(repository, times(1)).saveAll(anyList()); - assertThat(service.getCodelist(ListName.THIRD_PARTY, "TEST_CODE").getShortName()).isEqualTo("Test shortName"); - assertThat(service.getCodelist(ListName.THIRD_PARTY, "TEST_CODE").getDescription()).isEqualTo("Test description"); + assertThat(CodelistStaticService.getCodelist(ListName.THIRD_PARTY, "TEST_CODE").getShortName()).isEqualTo("Test shortName"); + assertThat(CodelistStaticService.getCodelist(ListName.THIRD_PARTY, "TEST_CODE").getDescription()).isEqualTo("Test description"); } @Test @@ -73,13 +69,13 @@ void update_shouldUpdateCodelist_whenRequestIsValid() { request.setShortName("name2"); request.setDescription("desc2"); - when(repository.findByListAndCode(ListName.THIRD_PARTY, "CODE")).thenReturn(Optional.of(request.convert())); - when(repository.saveAll(List.of(request.convert()))).thenReturn(List.of(request.convert())); + when(repository.findByListAndCode(ListName.THIRD_PARTY, "CODE")).thenReturn(Optional.of(request.convertToCodelist())); + when(repository.saveAll(List.of(request.convertToCodelist()))).thenReturn(List.of(request.convertToCodelist())); service.update(List.of(request)); verify(repository, times(1)).saveAll(anyList()); - Codelist codelist = service.getCodelist(ListName.THIRD_PARTY, request.getCode()); + Codelist codelist = CodelistStaticService.getCodelist(ListName.THIRD_PARTY, request.getCode()); assertThat(codelist.getShortName()).isEqualTo("name2"); assertThat(codelist.getDescription()).isEqualTo("desc2"); } @@ -92,7 +88,7 @@ void delete_shouldDelete_whenListAndCodeExists() { service.delete(ListName.THIRD_PARTY, "DELETE_CODE"); verify(repository, times(1)).delete(any(Codelist.class)); - assertNull(service.getCodelist(ListName.THIRD_PARTY, "DELETE_CODE")); + assertNull(CodelistStaticService.getCodelist(ListName.THIRD_PARTY, "DELETE_CODE")); } @Test diff --git a/apps/backend/polly-test/polly-test-component/src/test/java/no/nav/data/polly/codelist/CodelistUtils.java b/apps/backend/polly-test/polly-test-component/src/test/java/no/nav/data/polly/codelist/CodelistUtils.java index b0dad39b8..7bca4242f 100644 --- a/apps/backend/polly-test/polly-test-component/src/test/java/no/nav/data/polly/codelist/CodelistUtils.java +++ b/apps/backend/polly-test/polly-test-component/src/test/java/no/nav/data/polly/codelist/CodelistUtils.java @@ -23,6 +23,10 @@ public static Codelist createCodelist(ListName listName, String code) { return createCodelist(listName, code, "shortName", "description"); } + public static Codelist createCodelist(String listName, String code) { + return createCodelist(ListName.valueOf(listName), code, "shortName", "description"); + } + public static Codelist createCodelist(ListName listName, String code, String shortName, String description) { return Codelist.builder() .list(listName) diff --git a/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/IntegrationTestBase.java b/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/IntegrationTestBase.java index b70512b20..cdda65451 100644 --- a/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/IntegrationTestBase.java +++ b/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/IntegrationTestBase.java @@ -10,6 +10,7 @@ import no.nav.data.polly.IntegrationTestBase.Initializer; import no.nav.data.polly.codelist.CodelistStub; import no.nav.data.polly.codelist.domain.ListName; +import no.nav.data.polly.codelist.dto.CodelistResponse; import no.nav.data.polly.disclosure.domain.Disclosure; import no.nav.data.polly.disclosure.domain.DisclosureData; import no.nav.data.polly.disclosure.domain.DisclosureRepository; @@ -80,7 +81,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.get; import static com.github.tomakehurst.wiremock.client.WireMock.okJson; -import static no.nav.data.polly.codelist.CodelistService.getCodelistResponse; +import static no.nav.data.polly.codelist.CodelistStaticService.getCodelist; import static no.nav.data.polly.process.domain.sub.Dpia.convertDpia; import static no.nav.data.polly.process.domain.sub.Retention.convertRetention; @@ -388,9 +389,9 @@ protected ProcessResponseBuilder processResponseBuilder(UUID processId) { .name("Auto_" + PURPOSE_CODE1) .description("process description") .additionalDescription("additional description") - .purposes(List.of(getCodelistResponse(ListName.PURPOSE, PURPOSE_CODE1))) + .purposes(List.of(CodelistResponse.buildFrom(getCodelist(ListName.PURPOSE, PURPOSE_CODE1)))) .affiliation(affiliationResponse()) - .commonExternalProcessResponsible(getCodelistResponse(ListName.THIRD_PARTY, "SKATT")) + .commonExternalProcessResponsible(CodelistResponse.buildFrom(getCodelist(ListName.THIRD_PARTY, "SKATT"))) .start(LocalDate.now()) .end(LocalDate.now()) .legalBasis(legalBasisResponse()) @@ -406,10 +407,10 @@ protected ProcessResponseBuilder processResponseBuilder(UUID processId) { protected AffiliationResponse affiliationResponse() { return AffiliationResponse.builder() - .department(getCodelistResponse(ListName.DEPARTMENT, "DEP")) - .subDepartment(getCodelistResponse(ListName.SUB_DEPARTMENT, "SUBDEP")) + .department(CodelistResponse.buildFrom(getCodelist(ListName.DEPARTMENT, "DEP"))) + .subDepartment(CodelistResponse.buildFrom(getCodelist(ListName.SUB_DEPARTMENT, "SUBDEP"))) .productTeam("teamid1") - .product(getCodelistResponse(ListName.SYSTEM, "PESYS")) + .product(CodelistResponse.buildFrom(getCodelist(ListName.SYSTEM, "PESYS"))) .build(); } diff --git a/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/codelist/CodeUsageControllerIT.java b/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/codelist/CodeUsageControllerIT.java index 05fa94506..96ac61430 100644 --- a/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/codelist/CodeUsageControllerIT.java +++ b/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/codelist/CodeUsageControllerIT.java @@ -1,8 +1,8 @@ package no.nav.data.polly.codelist; import no.nav.data.polly.IntegrationTestBase; +import no.nav.data.polly.codelist.domain.Codelist; import no.nav.data.polly.codelist.dto.CodeUsageResponse; -import no.nav.data.polly.codelist.dto.CodelistRequest; import no.nav.data.polly.codelist.dto.CodelistUsageResponse; import no.nav.data.polly.codelist.dto.ReplaceCodelistRequest; import no.nav.data.polly.informationtype.domain.InformationType; @@ -24,7 +24,7 @@ import java.util.List; import java.util.Objects; -import static no.nav.data.polly.codelist.CodelistUtils.createCodelistRequest; +import static no.nav.data.polly.codelist.CodelistUtils.createCodelist; import static org.assertj.core.api.Assertions.assertThat; public class CodeUsageControllerIT extends IntegrationTestBase { @@ -162,7 +162,7 @@ class replaceCodelist { }) void replaceCodelistUsage(String list, String code, int informationTypes, int policies, int processes, int dpProcesses, int disclosures, int documents, int processors) { String newCode = "REPLACECODE"; - codelistService.save(List.of(createCodelistRequest(list, newCode))); + codelistService.save(List.of(createCodelist(list, newCode))); var noactions = replaceCode(list, newCode, code); assertThat(noactions.isInUse()).isFalse(); @@ -231,39 +231,39 @@ private void createTestData() { } private void createCodelistsByRequests() { - List requests = List.of( - createCodelistRequest("CATEGORY", "PERSONALIA"), - createCodelistRequest("CATEGORY", "ARBEIDSFORHOLD"), + List requests = List.of( + createCodelist("CATEGORY", "PERSONALIA"), + createCodelist("CATEGORY", "ARBEIDSFORHOLD"), - createCodelistRequest("DEPARTMENT", "YTA"), - createCodelistRequest("DEPARTMENT", "OTHER_DEP"), + createCodelist("DEPARTMENT", "YTA"), + createCodelist("DEPARTMENT", "OTHER_DEP"), - createCodelistRequest("GDPR_ARTICLE", "ART61E"), - createCodelistRequest("GDPR_ARTICLE", "ART92A"), + createCodelist("GDPR_ARTICLE", "ART61E"), + createCodelist("GDPR_ARTICLE", "ART92A"), - createCodelistRequest("NATIONAL_LAW", "FTRL"), - createCodelistRequest("NATIONAL_LAW", "OTHER_LAW"), + createCodelist("NATIONAL_LAW", "FTRL"), + createCodelist("NATIONAL_LAW", "OTHER_LAW"), - createCodelistRequest("PURPOSE", "DAGPENGER"), - createCodelistRequest("PURPOSE", "BARNETRYGD"), - createCodelistRequest("PURPOSE", "OTHER_PURP"), + createCodelist("PURPOSE", "DAGPENGER"), + createCodelist("PURPOSE", "BARNETRYGD"), + createCodelist("PURPOSE", "OTHER_PURP"), - createCodelistRequest("SENSITIVITY", "POL"), - createCodelistRequest("SENSITIVITY", "OTHER_SENS"), + createCodelist("SENSITIVITY", "POL"), + createCodelist("SENSITIVITY", "OTHER_SENS"), - createCodelistRequest("THIRD_PARTY", "SKATTEETATEN"), - createCodelistRequest("THIRD_PARTY", "ARBEIDSGIVER"), + createCodelist("THIRD_PARTY", "SKATTEETATEN"), + createCodelist("THIRD_PARTY", "ARBEIDSGIVER"), - createCodelistRequest("SUB_DEPARTMENT", "NAY"), + createCodelist("SUB_DEPARTMENT", "NAY"), - createCodelistRequest("SUBJECT_CATEGORY", "BRUKER"), - createCodelistRequest("SUBJECT_CATEGORY", "OTHER_SUBCAT"), + createCodelist("SUBJECT_CATEGORY", "BRUKER"), + createCodelist("SUBJECT_CATEGORY", "OTHER_SUBCAT"), - createCodelistRequest("SYSTEM", "TPS"), - createCodelistRequest("SYSTEM", "AA_REG"), + createCodelist("SYSTEM", "TPS"), + createCodelist("SYSTEM", "AA_REG"), - createCodelistRequest("TRANSFER_GROUNDS_OUTSIDE_EU", "APPROVED_THIRD_COUNTRY"), - createCodelistRequest("TRANSFER_GROUNDS_OUTSIDE_EU", "OTHER")); + createCodelist("TRANSFER_GROUNDS_OUTSIDE_EU", "APPROVED_THIRD_COUNTRY"), + createCodelist("TRANSFER_GROUNDS_OUTSIDE_EU", "OTHER")); codelistService.save(requests); } diff --git a/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/codelist/CodelistControllerIT.java b/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/codelist/CodelistControllerIT.java index daeb492a3..1ee269792 100644 --- a/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/codelist/CodelistControllerIT.java +++ b/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/codelist/CodelistControllerIT.java @@ -25,6 +25,7 @@ import java.util.Collections; import java.util.List; +import static no.nav.data.common.utils.StreamUtils.convert; import static no.nav.data.polly.codelist.CodelistUtils.createCodelist; import static no.nav.data.polly.codelist.CodelistUtils.createCodelistRequest; import static no.nav.data.polly.codelist.CodelistUtils.createNrOfCodelistRequests; @@ -68,8 +69,8 @@ void findAll_shouldReturnAllCodelists() { assertThat(responseEntity.getBody().getCodelist()).hasSize(ListName.values().length); Arrays.stream(ListName.values()) - .forEach(listName -> assertThat(responseEntity.getBody().getCodelist() - .get(listName)).containsAll(service.getCodelistResponseList(listName))); + .forEach(listName -> assertThat(responseEntity.getBody().getCodelist().get(listName)) + .containsAll(CodelistResponse.convertToCodelistResponses(CodelistStaticService.getCodelists(listName)))); } @Test @@ -79,7 +80,7 @@ void getCodelistByListName() { assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(responseEntity.getBody()).isNotNull(); - assertThat(responseEntity.getBody()).isEqualTo(service.getCodelistResponseList(ListName.THIRD_PARTY)); + assertThat(responseEntity.getBody()).isEqualTo(CodelistResponse.convertToCodelistResponses(CodelistStaticService.getCodelists(ListName.THIRD_PARTY))); } @Test @@ -91,7 +92,7 @@ void getByListNameAndCode() { assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); assertThat(responseEntity.getBody()).isNotNull(); - assertThat(responseEntity.getBody().getDescription()).isEqualTo(service.getCodelist(ListName.THIRD_PARTY, "TEST_CODE").getDescription()); + assertThat(responseEntity.getBody().getDescription()).isEqualTo(CodelistStaticService.getCodelist(ListName.THIRD_PARTY, "TEST_CODE").getDescription()); } @Test @@ -147,7 +148,7 @@ void shouldSaveNewCodelists() { assertThat(codelist.getDescription()).isEqualTo("SaveDescription"); assertTrue(CodelistCache.contains(ListName.THIRD_PARTY, "SAVECODE")); - Codelist savedCodelist = service.getCodelist(ListName.THIRD_PARTY, "SAVECODE"); + Codelist savedCodelist = CodelistStaticService.getCodelist(ListName.THIRD_PARTY, "SAVECODE"); assertThat(savedCodelist.getCode()).isEqualTo("SAVECODE"); assertThat(savedCodelist.getShortName()).isEqualTo("SaveShortName"); assertThat(savedCodelist.getDescription()).isEqualTo("SaveDescription"); @@ -172,7 +173,7 @@ void shouldSave20Codelist() { "/codelist", HttpMethod.POST, new HttpEntity<>(requests), CODELIST_LIST_RESP); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.CREATED); - assertThat(CodelistService.getCodelist(ListName.THIRD_PARTY).size()).isEqualTo(20); + assertThat(CodelistStaticService.getCodelist(ListName.THIRD_PARTY).size()).isEqualTo(20); } @Test @@ -203,8 +204,8 @@ class Update { @Test void shouldUpdateOneCodelist() { saveCodelist(createCodelist(ListName.THIRD_PARTY, "CODE", "SavedShortName", "SavedDescription")); - assertThat(service.getCodelist(ListName.THIRD_PARTY, "CODE").getShortName()).isEqualTo("SavedShortName"); - assertThat(service.getCodelist(ListName.THIRD_PARTY, "CODE").getDescription()).isEqualTo("SavedDescription"); + assertThat(CodelistStaticService.getCodelist(ListName.THIRD_PARTY, "CODE").getShortName()).isEqualTo("SavedShortName"); + assertThat(CodelistStaticService.getCodelist(ListName.THIRD_PARTY, "CODE").getDescription()).isEqualTo("SavedDescription"); List updatedCodelists = List.of( createCodelistRequest("THIRD_PARTY", "CODE", "UpdatedShortName", "UpdatedDescription")); @@ -213,8 +214,8 @@ void shouldUpdateOneCodelist() { "/codelist", HttpMethod.PUT, new HttpEntity<>(updatedCodelists), String.class); assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(service.getCodelist(ListName.THIRD_PARTY, "CODE").getShortName()).isEqualTo("UpdatedShortName"); - assertThat(service.getCodelist(ListName.THIRD_PARTY, "CODE").getDescription()).isEqualTo("UpdatedDescription"); + assertThat(CodelistStaticService.getCodelist(ListName.THIRD_PARTY, "CODE").getShortName()).isEqualTo("UpdatedShortName"); + assertThat(CodelistStaticService.getCodelist(ListName.THIRD_PARTY, "CODE").getDescription()).isEqualTo("UpdatedDescription"); } @Test @@ -236,8 +237,8 @@ void shouldUpdate20Codelists() { assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK); - assertThat(CodelistService.getCodelist(ListName.THIRD_PARTY).size()).isEqualTo(20); - List list = CodelistService.getCodelist(ListName.THIRD_PARTY); + assertThat(CodelistStaticService.getCodelist(ListName.THIRD_PARTY).size()).isEqualTo(20); + List list = CodelistStaticService.getCodelist(ListName.THIRD_PARTY); list.forEach(cod -> { assertThat(cod.getShortName()).isEqualTo("UpdatedShortName"); assertThat(cod.getDescription()).isEqualTo("UpdatedDescription"); diff --git a/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/disclosure/DisclosureControllerIT.java b/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/disclosure/DisclosureControllerIT.java index 7d394728d..a0be570be 100644 --- a/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/disclosure/DisclosureControllerIT.java +++ b/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/disclosure/DisclosureControllerIT.java @@ -1,7 +1,7 @@ package no.nav.data.polly.disclosure; import no.nav.data.polly.IntegrationTestBase; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.ListName; import no.nav.data.polly.codelist.dto.CodelistResponse; import no.nav.data.polly.disclosure.DisclosureController.DisclosurePage; @@ -68,15 +68,15 @@ private void assertResponse(ResponseEntity resp) { disclosureResponse.setChangeStamp(null); InformationTypeShortResponse infoTypeRes = new InformationTypeShortResponse(infoType.getId(), infoType.getData().getName(), - CodelistService.getCodelistResponse(ListName.SENSITIVITY, infoType.getData().getSensitivity())); + CodelistStaticService.getCodelistResponse(ListName.SENSITIVITY, infoType.getData().getSensitivity())); - CodelistResponse department = CodelistService.getCodelistResponse(ListName.DEPARTMENT, "DEP"); + CodelistResponse department = CodelistStaticService.getCodelistResponse(ListName.DEPARTMENT, "DEP"); assertThat(disclosureResponse).isEqualTo(DisclosureResponse.builder() .id(disclosureResponse.getId()) .name("disc name") .description("disc desc") - .recipient(CodelistService.getCodelistResponse(ListName.THIRD_PARTY, disclosureResponse.getRecipient().getCode())) + .recipient(CodelistStaticService.getCodelistResponse(ListName.THIRD_PARTY, disclosureResponse.getRecipient().getCode())) .recipientPurpose("recipient purpose") .start(LocalDate.now()) .end(LocalDate.now()) @@ -91,7 +91,7 @@ private void assertResponse(ResponseEntity resp) { .informationTypes(List.of(DocumentInfoTypeUseResponse.builder() .informationTypeId(infoTypeRes.getId()) .informationType(infoTypeRes) - .subjectCategory(CodelistService.getCodelistResponse(ListName.SUBJECT_CATEGORY, "BRUKER")).build())) + .subjectCategory(CodelistStaticService.getCodelistResponse(ListName.SUBJECT_CATEGORY, "BRUKER")).build())) .build()) .informationTypeIds(List.of()) .processIds(List.of()) diff --git a/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/document/DocumentControllerIT.java b/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/document/DocumentControllerIT.java index 53de566a4..47c170d27 100644 --- a/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/document/DocumentControllerIT.java +++ b/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/document/DocumentControllerIT.java @@ -1,8 +1,9 @@ package no.nav.data.polly.document; import no.nav.data.polly.IntegrationTestBase; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.ListName; +import no.nav.data.polly.codelist.dto.CodelistResponse; import no.nav.data.polly.document.DocumentController.DocumentPage; import no.nav.data.polly.document.dto.DocumentInfoTypeUseRequest; import no.nav.data.polly.document.dto.DocumentInfoTypeUseResponse; @@ -62,7 +63,7 @@ private void assertResponse(ResponseEntity resp) { assertThat(documentResponse).isNotNull(); InformationTypeShortResponse infoTypeRes = new InformationTypeShortResponse(infoType.getId(), infoType.getData().getName(), - CodelistService.getCodelistResponse(ListName.SENSITIVITY, infoType.getData().getSensitivity())); + CodelistResponse.buildFrom(CodelistStaticService.getCodelist(ListName.SENSITIVITY, infoType.getData().getSensitivity()))); assertThat(documentResponse).isEqualTo(DocumentResponse.builder() .id(documentResponse.getId()) @@ -70,7 +71,7 @@ private void assertResponse(ResponseEntity resp) { .description("desc") .informationTypes(List.of(DocumentInfoTypeUseResponse.builder().informationTypeId(infoTypeRes.getId()) .informationType(infoTypeRes) - .subjectCategory(CodelistService.getCodelistResponse(ListName.SUBJECT_CATEGORY, "BRUKER")).build())) + .subjectCategory(CodelistResponse.buildFrom(CodelistStaticService.getCodelist(ListName.SUBJECT_CATEGORY, "BRUKER"))).build())) .build()); } diff --git a/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/process/ProcessControllerIT.java b/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/process/ProcessControllerIT.java index c9ef0b38c..c4a929b20 100644 --- a/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/process/ProcessControllerIT.java +++ b/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/process/ProcessControllerIT.java @@ -5,7 +5,7 @@ import no.nav.data.common.security.azure.AzureUserInfo; import no.nav.data.common.utils.MdcUtils; import no.nav.data.polly.IntegrationTestBase; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.ListName; import no.nav.data.polly.informationtype.dto.InformationTypeShortResponse; import no.nav.data.polly.legalbasis.dto.LegalBasisRequest; @@ -68,13 +68,13 @@ void getProcess() { .policy(PolicyResponse.builder() .id(policy.getId()) .processId(policy.getProcess().getId()) - .purpose(CodelistService.getCodelistResponse(ListName.PURPOSE, PURPOSE_CODE1)) + .purpose(CodelistStaticService.getCodelistResponse(ListName.PURPOSE, PURPOSE_CODE1)) .informationTypeId(createAndSaveInformationType().getId()) .informationType( new InformationTypeShortResponse(createAndSaveInformationType().getId(), INFORMATION_TYPE_NAME, createAndSaveInformationType().getData().sensitivityCode())) .legalBasesUse(LegalBasesUse.DEDICATED_LEGAL_BASES) - .subjectCategory(CodelistService.getCodelistResponse(ListName.SUBJECT_CATEGORY, policy.getData().getSubjectCategories().get(0))) + .subjectCategory(CodelistStaticService.getCodelistResponse(ListName.SUBJECT_CATEGORY, policy.getData().getSubjectCategories().get(0))) .legalBasis(legalBasisResponse()) .documentIds(policy.getData().getDocumentIds()) .build()) @@ -232,11 +232,11 @@ void getAllProcess() { assertThat(processPage.getContent()).contains( processResponseBuilder(policy.getProcess().getId()) .name("Auto_" + PURPOSE_CODE1) - .purposes(List.of(CodelistService.getCodelistResponse(ListName.PURPOSE, PURPOSE_CODE1))) + .purposes(List.of(CodelistStaticService.getCodelistResponse(ListName.PURPOSE, PURPOSE_CODE1))) .build(), processResponseBuilder(policy2.getProcess().getId()) .name("Auto_" + PURPOSE_CODE1 + 2) - .purposes(List.of(CodelistService.getCodelistResponse(ListName.PURPOSE, PURPOSE_CODE1 + 2))) + .purposes(List.of(CodelistStaticService.getCodelistResponse(ListName.PURPOSE, PURPOSE_CODE1 + 2))) .build() ); assertThat(processPage.getContent().get(0).getNumber()).isEqualTo(policy2.getProcess().getData().getNumber()); diff --git a/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/process/dpprocess/DpProcessControllerIT.java b/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/process/dpprocess/DpProcessControllerIT.java index f5e7fae66..04be192f8 100644 --- a/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/process/dpprocess/DpProcessControllerIT.java +++ b/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/process/dpprocess/DpProcessControllerIT.java @@ -1,7 +1,7 @@ package no.nav.data.polly.process.dpprocess; import no.nav.data.polly.IntegrationTestBase; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.ListName; import no.nav.data.polly.process.dpprocess.DpProcessController.DpProcessPage; import no.nav.data.polly.process.dpprocess.dto.DpProcessRequest; @@ -106,7 +106,7 @@ private void assertBody(DpProcessResponse body) { .name("name") .dpProcessNumber(body.getDpProcessNumber()) .affiliation(affiliationResponse()) - .externalProcessResponsible(CodelistService.getCodelistResponse(ListName.THIRD_PARTY, "SKATT")) + .externalProcessResponsible(CodelistStaticService.getCodelistResponse(ListName.THIRD_PARTY, "SKATT")) .start(LocalDate.now()) .end(LocalDate.now().plusDays(1)) .dataProcessingAgreement("Agreement 1") diff --git a/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/processor/ProcessorControllerIT.java b/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/processor/ProcessorControllerIT.java index 8f198e341..a8d5ff524 100644 --- a/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/processor/ProcessorControllerIT.java +++ b/apps/backend/polly-test/polly-test-integration/src/test/java/no/nav/data/polly/processor/ProcessorControllerIT.java @@ -1,7 +1,7 @@ package no.nav.data.polly.processor; import no.nav.data.polly.IntegrationTestBase; -import no.nav.data.polly.codelist.CodelistService; +import no.nav.data.polly.codelist.CodelistStaticService; import no.nav.data.polly.codelist.domain.ListName; import no.nav.data.polly.processor.ProcessorController.ProcessorPage; import no.nav.data.polly.processor.domain.Processor; @@ -123,7 +123,7 @@ private void assertBody(ProcessorResponse body) { .note("note") .outsideEU(true) - .transferGroundsOutsideEU(CodelistService.getCodelistResponse(ListName.TRANSFER_GROUNDS_OUTSIDE_EU, "OTHER")) + .transferGroundsOutsideEU(CodelistStaticService.getCodelistResponse(ListName.TRANSFER_GROUNDS_OUTSIDE_EU, "OTHER")) .transferGroundsOutsideEUOther("reason") .country("FJI") .build());