Merge pull request #6888 from ORCID/NonPlannedStage

Stage name is NONE_PLANNED
ORCID · Sep 4, 2023 · 21e6d44 · 21e6d44
2 parents 37818e0 + 200ccb3
commit 21e6d44
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/orcid-web/src/main/java/org/orcid/frontend/salesforce/manager/SalesforceManagerImpl.java b/orcid-web/src/main/java/org/orcid/frontend/salesforce/manager/SalesforceManagerImpl.java
@@ -22,7 +22,7 @@
 @Component
 public class SalesforceManagerImpl implements SalesforceManager {
 
-    private static final List<String> visibleStatuses = List.of("In Development", "Complete", "Certified Service Provider", "None Planned");
+    private static final List<String> visibleStatuses = List.of("In Development", "Complete", "Certified Service Provider", "NONE_PLANNED");
 
     @Resource
     private SalesForceAdapter salesForceAdapter;
@@ -75,7 +75,17 @@ public MemberDetails retrieveMemberDetails(String memberId) {
                 if (integrations != null && integrations.length() > 0) {
                     List<Integration> integrationList = salesForceAdapter.createIntegrationsList(integrations);
                     // Filter by integration status
-                    List<Integration> filteredIntegrationList = integrationList.stream().filter(x -> visibleStatuses.contains(x.getStage())).collect(Collectors.toList());
+                    List<Integration> filteredIntegrationList = integrationList.stream()
+                            .filter(x -> {
+                                if(visibleStatuses.contains(x.getStage())) {
+                                    // NONE_PLANNED should be displayed as "None Planned" 
+                                    if(x.getStage().equals("NONE_PLANNED")) {
+                                        x.setStage("None Planned");
+                                    }
+                                    return true;
+                                }
+                                return false;
+                            }).collect(Collectors.toList());
                     details.setIntegrations(filteredIntegrationList);
                 } else {
                     details.setIntegrations(List.of());