add Government translation to the returning model

Csaba79-coder · Csaba79-coder · commit bf26c94205b1 · 2023-04-12T09:29:13.000+02:00
diff --git a/government-service/src/main/java/com/csaba79coder/bestprotocol/model/representative/service/RepresentativeService.java b/government-service/src/main/java/com/csaba79coder/bestprotocol/model/representative/service/RepresentativeService.java
@@ -63,11 +63,9 @@ public List<RepresentativeAdminModel> renderAllRepresentativesByGovernmentId(Str
     }
 
     private RepresentativeAdminModel getRepresentativeWithTranslation(UUID representativeId, String languageShortName) {
-        // TODO previous job title list!
         Representative currentRepresentative = representativeRepository.findById(representativeId).orElseThrow(() -> new NoSuchElementException("Representative not found"));
         GovernmentTranslation governmentTranslation = governmentTranslationRepository.findByGovernmentIdAndLanguageShortName(currentRepresentative.getGovernment().getId(), languageShortName);
         RepresentativeTranslation currentTranslation = representativeTranslationRepository.findRepresentativeTranslationByLanguageShortNameAndRepresentativeId(languageShortName, currentRepresentative.getId());
-
         if (currentTranslation != null) {
             RepresentativeTranslationManagerModel model = new RepresentativeTranslationManagerModel();
             model.setId(currentTranslation.getId());
@@ -108,6 +106,7 @@ private RepresentativeAdminModel getRepresentativeWithTranslation(UUID represent
                     .updatedAt(String.valueOf(currentRepresentative.getUpdatedAt()))
                     .createdBy(currentRepresentative.getCreatedBy())
                     .updatedBy(currentRepresentative.getUpdatedBy())
+                    .government(Mapper.mapGovernmentTranslationToAdminModel(governmentTranslation))
                     .phoneNumber(currentRepresentative.getPhoneNumber())
                     .email(currentRepresentative.getEmail())
                     .image(ImageUtil.decompressImage(currentRepresentative.getImage()))
