Merge branch 'OCD-4820' into development

chpladmin · Mar 4, 2025 · 815e856 · 815e856
2 parents 2389b77 + c0332fc
commit 815e856
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 19 deletions.
diff --git a/chpl/chpl-service/src/main/java/gov/healthit/chpl/activity/ActivityMetadataBuilder.java b/chpl/chpl-service/src/main/java/gov/healthit/chpl/activity/ActivityMetadataBuilder.java
@@ -49,7 +49,8 @@ protected void addGenericMetadata(ActivityDTO dto, ActivityMetadata metadata) {
                 .id(dto.getActivityObjectId())
                 .build());
         metadata.setConcept(dto.getConcept());
-        metadata.setResponsibleUser(chplUserToCognitoUserUtil.getUser(dto.getLastModifiedUser(), dto.getLastModifiedSsoUser()));
+        metadata.setResponsibleUser(dto.getUser() != null ? dto.getUser()
+                : chplUserToCognitoUserUtil.getUser(dto.getLastModifiedUser(), dto.getLastModifiedSsoUser()));
         metadata.setDescription(dto.getDescription());
         metadata.getCategories().add(getCrudCategory(dto));
     }

diff --git a/...chpl-service/src/main/java/gov/healthit/chpl/activity/ListingActivityMetadataBuilder.java b/...chpl-service/src/main/java/gov/healthit/chpl/activity/ListingActivityMetadataBuilder.java
@@ -7,22 +7,16 @@
 import gov.healthit.chpl.domain.activity.ActivityMetadata;
 import gov.healthit.chpl.domain.activity.ListingActivityMetadata;
 import gov.healthit.chpl.dto.ActivityDTO;
-import gov.healthit.chpl.search.ListingSearchService;
-import gov.healthit.chpl.search.domain.ListingSearchResult;
 import gov.healthit.chpl.util.ChplUserToCognitoUserUtil;
 import lombok.extern.log4j.Log4j2;
 
 @Log4j2
 @Component("listingActivityMetadataBuilder")
 public class ListingActivityMetadataBuilder extends ActivityMetadataBuilder {
 
-    private ListingSearchService listingSearchService;
-
     @Autowired
-    public ListingActivityMetadataBuilder(ChplUserToCognitoUserUtil chplUserToCognitoUserUtil,
-            ListingSearchService listingSearchService) {
+    public ListingActivityMetadataBuilder(ChplUserToCognitoUserUtil chplUserToCognitoUserUtil) {
         super(chplUserToCognitoUserUtil);
-        this.listingSearchService = listingSearchService;
     }
 
     @Override
@@ -32,15 +26,5 @@ protected void addConceptSpecificMetadata(final ActivityDTO dto, final ActivityM
         }
         ListingActivityMetadata listingMetadata = (ListingActivityMetadata) metadata;
         listingMetadata.getCategories().add(ActivityCategory.LISTING);
-        if (metadata.getObject() != null && metadata.getObject().getId() != null) {
-            try {
-                ListingSearchResult listingSearchResult = listingSearchService.findListing(metadata.getObject().getId());
-                if (listingSearchResult != null) {
-                    metadata.getObject().setName(listingSearchResult.getChplProductNumber());
-                }
-            } catch (Exception ex) {
-                LOGGER.error("Could not find listing " + metadata.getObject().getId() + " for activity metadata.", ex);
-            }
-        }
     }
 }
diff --git a/...chpl-service/src/main/java/gov/healthit/chpl/activity/ProductActivityMetadataBuilder.java b/...chpl-service/src/main/java/gov/healthit/chpl/activity/ProductActivityMetadataBuilder.java
@@ -36,7 +36,7 @@ protected void addConceptSpecificMetadata(ActivityDTO activity, ActivityMetadata
         if (metadata.getObject() != null && metadata.getObject().getId() != null) {
             Product product = null;
             try {
-                product = productDao.getById(metadata.getObject().getId(), false);
+                product = productDao.getById(metadata.getObject().getId(), true);
                 metadata.getObject().setName(product.getName());
             } catch (Exception ex) {
                 LOGGER.error("Could not find product " + metadata.getObject().getId() + " for activity metadata.", ex);