Merge branch 'develop' into EA-3956-3948_Galleries_isShownBy

europeana · Oct 25, 2024 · fec06f8 · fec06f8
2 parents aee5a71 + 417fa26
commit fec06f8
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/...nitions/src/main/java/eu/europeana/set/definitions/model/vocabulary/WebUserSetFields.java b/...nitions/src/main/java/eu/europeana/set/definitions/model/vocabulary/WebUserSetFields.java
@@ -41,7 +41,7 @@ public class WebUserSetFields extends WebUserSetModelFields {
     public static final String TEXT_SCORE_SORT            = "score";
 
     // JsonLd Constants
-    public static final String CONTEXT                    = "http://www.europeana.eu/schemas/context/collection.jsonld";
+    public static final String CONTEXT                    = "https://api.europeana.eu/schema/context/set.jsonld";
     public static final String CONTEXT_FIELD              = "@context";
     public static final String IDENTIFIER                 = "identifier";
     public static final String TITLE                      = "title";

diff --git a/set-integration-testing/src/integration-test/resources/content/userset_complete.json b/set-integration-testing/src/integration-test/resources/content/userset_complete.json
@@ -16,7 +16,7 @@
   "http://data.europeana.eu/item/08641/1037479000000476467",
   "http://data.europeana.eu/item/08641/1037479000000476875"
   ],
-  "@context": "http://www.europeana.eu/schemas/context/collection.jsonld",
+  "@context": "https://api.europeana.eu/schema/context/set.jsonld",
   "id":"http://data.europeana.eu/set/1",
   "created": "2020-08-28T13:43:07Z",
   "modified": "2020-08-28T13:44:48Z",

diff --git a/...integration-testing/src/integration-test/resources/content/userset_entity_best_items.json b/...integration-testing/src/integration-test/resources/content/userset_entity_best_items.json
@@ -1,5 +1,5 @@
 {
-"@context": "http://www.europeana.eu/schemas/context/collection.jsonld",
+"@context": "https://api.europeana.eu/schema/context/set.jsonld",
 "type": "EntityBestItemsSet",
 "title":{
 "en": "Sport - best items"

diff --git a/set-integration-testing/src/integration-test/resources/content/userset_large2.json b/set-integration-testing/src/integration-test/resources/content/userset_large2.json
@@ -1,5 +1,5 @@
 {
-   "@context":"http://www.europeana.eu/schemas/context/collection.jsonld",
+   "@context":"https://api.europeana.eu/schema/context/set.jsonld",
    "type":"Collection",
    "title":{
       "en":"SGoaB Test Dataset"

diff --git a/...g/src/test/java/eu/europeana/api/set/integration/migration/GalleryDepictionMigration.java b/...g/src/test/java/eu/europeana/api/set/integration/migration/GalleryDepictionMigration.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import javax.annotation.Resource;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.security.core.Authentication;
 import org.springframework.test.context.DynamicPropertyRegistry;
@@ -54,7 +53,10 @@ static void setProperties(DynamicPropertyRegistry registry) {
       registry.add("mongodb.set.connectionUrl",  () -> "mongodb://127.0.0.1:27017/set_test"); 
   }
 
-  @Test
+  /*
+   * Generate isShownBy field for all sets in the (local) db
+   */
+  //@Test
   public void generateGalleriesWithDepiction() throws Exception {
     createTestUserSet(USER_SET_REGULAR, regularUserToken);
 
@@ -87,7 +89,6 @@ public void generateGalleriesWithDepiction() throws Exception {
 
   }
 
-
   private void generateDepictions(List<? extends UserSet> results) {
     for (UserSet userSet : results) {
       final WebResource isShownBy = generateGalleryDepiction(userSet);
@@ -100,7 +101,6 @@ private void generateDepictions(List<? extends UserSet> results) {
     }
   }
 
-
   private WebResource generateGalleryDepiction(UserSet userSet){
     if(userSet.isOpenSet() || userSet.isBookmarksFolder() || userSet.isEntityBestItemsSet()) {
       //bookmarks and entity best items sets is redundant, but we keep it for future
@@ -117,14 +117,9 @@ private WebResource generateGalleryDepiction(UserSet userSet){
       return null;
     }
   }
-
-
 
-
-
   private boolean hasNext(final int pageSize, ResultSet<? extends UserSet> results) {
     return results.getResultSize() < pageSize;
   }
 
-
 }