profile parameter can be a comma separated string

europeana · Jun 11, 2024 · dd497c2 · dd497c2
1 parent a507767
commit dd497c2
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 14 deletions.
diff --git a/set-web/src/main/java/eu/europeana/set/web/service/UserSetService.java b/set-web/src/main/java/eu/europeana/set/web/service/UserSetService.java
@@ -219,6 +219,15 @@ ItemIdsResultPage buildItemIdsResultsPage(String setId, List<String> itemIds, in
      * @return profiled user set value
      */
     void applyProfile(UserSet userSet, LdProfiles profile);
+
+    /**
+     * Gets the profile for pagination urls and item page. Basically gets the profile valid for
+     * collection page from the list of profiles passed during search request
+     *
+     * @param profiles
+     * @return
+     */
+    LdProfiles getProfileForPagination(List<LdProfiles> profiles);
 
     /**
      * Return the List of entity sets with

diff --git a/set-web/src/main/java/eu/europeana/set/web/service/controller/jsonld/WebUserSetRest.java b/set-web/src/main/java/eu/europeana/set/web/service/controller/jsonld/WebUserSetRest.java
@@ -99,7 +99,10 @@ protected ResponseEntity<String> storeUserSet(String userSetJsonLdStr,
       throws HttpException {
     try {
 
-      LdProfiles profile = getProfile(profileStr, request);
+      // validate params - profile
+      List<LdProfiles> profiles = getProfiles(profileStr, request);
+      // get profile for pagination urls and item Page
+      LdProfiles profile = getUserSetService().getProfileForPagination(profiles);      
 
       // parse user set
       UserSet webUserSet = getUserSetService().parseUserSetLd(userSetJsonLdStr);
@@ -213,7 +216,10 @@ private ResponseEntity<String> getUserSet(String profileStr, String identifier,
       HttpServletRequest request, String sort, String sortOrder, Integer pageNr, int pageSize,
       Authentication authentication) throws HttpException {
     try {
-      LdProfiles profile = getProfile(profileStr, request);
+      // validate params - profile
+      List<LdProfiles> profiles = getProfiles(profileStr, request);
+      // get profile for pagination urls and item Page
+      LdProfiles profile = getUserSetService().getProfileForPagination(profiles);      
 
       // retrieve a Set based on its identifier - process query
       // if the Set doesn’t exist, respond with HTTP 404
@@ -289,7 +295,10 @@ protected ResponseEntity<String> updateUserSet(HttpServletRequest request, Authe
 	    String identifier, String userSetJsonLdStr, String profileStr) throws HttpException {
 
 	try {
-	    LdProfiles profile = getProfile(profileStr, request);
+        // validate params - profile
+        List<LdProfiles> profiles = getProfiles(profileStr, request);
+        // get profile for pagination urls and item Page
+        LdProfiles profile = getUserSetService().getProfileForPagination(profiles);      
 
 	    // check if the Set exists, if not respond with HTTP 404
 	    // retrieve an existing user set based on its identifier
@@ -407,8 +416,12 @@ protected ResponseEntity<String> publishUnpublishUserSet(String identifier,
       UserSet updatedUserSet =
           getUserSetService().publishUnpublishUserSet(identifier, issued, authentication, publish);
 
+      // validate params - profile
+      List<LdProfiles> profiles = getProfiles(profileStr, request);
+      // get profile for pagination urls and item Page
+      LdProfiles profile = getUserSetService().getProfileForPagination(profiles);    
+
       // serialize to JsonLd
-      LdProfiles profile = getProfile(profileStr, request);
       String serializedUserSetJsonLdStr = serializeUserSet(profile, updatedUserSet);
       String etag =
           generateETag(updatedUserSet.getModified(), WebFields.FORMAT_JSONLD, getApiVersion());
@@ -470,7 +483,10 @@ protected ResponseEntity<String> insertItemIntoUserSet(HttpServletRequest reques
       String position, String profileStr) throws HttpException {
 
     try {
-      LdProfiles profile = getProfile(profileStr, request);
+      // validate params - profile
+      List<LdProfiles> profiles = getProfiles(profileStr, request);
+      // get profile for pagination urls and item Page
+      LdProfiles profile = getUserSetService().getProfileForPagination(profiles);      
 
       // check if the Set exists, if not respond with HTTP 404
       // retrieve an existing user set based on its identifier
@@ -648,8 +664,11 @@ protected ResponseEntity<String> deleteItemFromUserSet(HttpServletRequest reques
       String profileStr) throws HttpException {
 
     try {
-      LdProfiles profile = getProfile(profileStr, request);
-
+      // validate params - profile
+      List<LdProfiles> profiles = getProfiles(profileStr, request);
+      // get profile for pagination urls and item Page
+      LdProfiles profile = getUserSetService().getProfileForPagination(profiles);      
+
       // check if the Set exists, if not respond with HTTP 404
       // retrieve an existing user set based on its identifier
       UserSet existingUserSet = getUserSetService().getUserSetById(identifier);

diff --git a/set-web/src/main/java/eu/europeana/set/web/service/impl/BaseUserSetServiceImpl.java b/set-web/src/main/java/eu/europeana/set/web/service/impl/BaseUserSetServiceImpl.java
@@ -462,13 +462,7 @@ private boolean isUri(String value) {
     return value.startsWith("http://") || value.startsWith("https://");
   }
 
-  /**
-   * Gets the profile for pagination urls and item page. Basically gets the profile valid for
-   * collection page from the list of profiles passed during search request
-   *
-   * @param profiles
-   * @return
-   */
+  @Override
   public LdProfiles getProfileForPagination(List<LdProfiles> profiles) {
     LdProfiles profile = null;
     for (LdProfiles ldProfile : profiles) {