Merge branch 'malowe/dev/remove-history-check' into 'dev'

Change logic to not check contact history for retrieval of user data

See merge request !552

portal/src/main/java/org/eclipsefoundation/api/PeopleAPI.java

@@ -60,16 +60,12 @@ public interface PeopleAPI {
         @QueryParam("project_relation")
         public abstract String getRelation();
 
-        @Nullable
-        @QueryParam("is_not_expired")
-        public abstract Boolean getIsNotExpired();
-
         @Nullable
         @QueryParam("ids")
         public abstract List<String> getIds();
 
         public static Builder builder() {
-            return new AutoValue_PeopleAPI_PeopleRequestParams.Builder().setIsNotExpired(false);
+            return new AutoValue_PeopleAPI_PeopleRequestParams.Builder();
         }
 
         @AutoValue.Builder
@@ -89,8 +85,6 @@ public interface PeopleAPI {
 
             public abstract Builder setIds(@Nullable List<String> ids);
 
-            public abstract Builder setIsNotExpired(@Nullable Boolean isNotExpired);
-
             public abstract PeopleRequestParams build();
         }
     }

portal/src/main/java/org/eclipsefoundation/membership/portal/service/impl/FoundationDBOrganizationService.java

@@ -250,27 +250,33 @@ public class FoundationDBOrganizationService implements OrganizationsService {
         params.add("fName", fName.orElse(null));
         params.add("lName", lName.orElse(null));
         return cache.get(orgID, params, OrganizationContactData.class,
-                () -> middleware.getAll(i -> orgAPI.getOrganizationContactsWithSearch(orgID, i,
-                        OrganizationRequestParams.builder().setRelation(role.orElse(null))
-                                .setFirstName(fName.orElse(null)).setLastName(lName.orElse(null))
-                                .setEmail(mail.orElse(null)).build()),
+                () -> middleware.getAll(
+                        i -> orgAPI.getOrganizationContactsWithSearch(orgID, i,
+                                OrganizationRequestParams.builder().setRelation(role.orElse(null))
+                                        .setFirstName(fName.orElse(null)).setLastName(lName.orElse(null))
+                                        .setEmail(mail.orElse(null)).setIsNotExpired(false).build()),
                         OrganizationContactData.class));
     }
 
     @Override
     public Optional<List<OrganizationContactData>> getOrganizationContacts(String orgID, String userName) {
-        return cache.get(orgID, new MultivaluedMapImpl<>(), OrganizationContactData.class, () -> middleware.getAll(
-                i -> orgAPI.getOrganizationContact(orgID, userName, i, OrganizationRequestParams.builder().build()),
-                OrganizationContactData.class));
+        return cache.get(orgID, new MultivaluedMapImpl<>(), OrganizationContactData.class,
+                () -> middleware.getAll(
+                        i -> orgAPI.getOrganizationContact(orgID, userName, i,
+                                OrganizationRequestParams.builder().setIsNotExpired(false).build()),
+                        OrganizationContactData.class));
     }
 
     @Override
     public Optional<List<OrganizationContactData>> getOrganizationContacts(String userName) {
-        return cache.get(userName, new MultivaluedMapImpl<>(), OrganizationContactData.class,
-                () -> middleware.getAll(
-                        i -> orgAPI.getOrganizationContacts(i,
-                                OrganizationRequestParams.builder().setPersonID(userName).build()),
-                        OrganizationContactData.class));
+        return cache
+                .get(userName, new MultivaluedMapImpl<>(), OrganizationContactData.class,
+                        () -> middleware.getAll(
+                                i -> orgAPI
+                                        .getOrganizationContacts(i,
+                                                OrganizationRequestParams.builder().setPersonID(userName)
+                                                        .setIsNotExpired(false).build()),
+                                OrganizationContactData.class));
     }
 
     @Override
@@ -278,11 +284,14 @@ public class FoundationDBOrganizationService implements OrganizationsService {
         MultivaluedMap<String, String> params = new MultivaluedMapImpl<>();
         params.add(FoundationDBParameterNames.USER_NAME.getName(), userName);
         params.add(FoundationDBParameterNames.RELATION.getName(), role);
-        Optional<List<OrganizationContactData>> contacts = cache.get(orgID, params, OrganizationContactData.class,
-                () -> middleware.getAll(
-                        i -> orgAPI.getOrganizationContact(orgID, userName, i,
-                                OrganizationRequestParams.builder().setRelation(role).build()),
-                        OrganizationContactData.class));
+        Optional<List<OrganizationContactData>> contacts = cache
+                .get(orgID, params, OrganizationContactData.class,
+                        () -> middleware.getAll(
+                                i -> orgAPI
+                                        .getOrganizationContact(orgID, userName, i,
+                                                OrganizationRequestParams.builder().setRelation(role)
+                                                        .setIsNotExpired(false).build()),
+                                OrganizationContactData.class));
         // if we have results, then the relation exists for user
         return contacts.isPresent() && !contacts.get().isEmpty();
     }
@@ -413,7 +422,8 @@ public class FoundationDBOrganizationService implements OrganizationsService {
                 new URI(info.getCompanyUrl());
                 out.setWebsite(info.getCompanyUrl());
             } catch (URISyntaxException e) {
-                LOGGER.debug("Error while converting URL for organization '{}', leaving blank", info.getOrganizationID(), e);
+                LOGGER.debug("Error while converting URL for organization '{}', leaving blank",
+                        info.getOrganizationID(), e);
             }
         }