[MODINVSTOR-1264] Add codes to Subject sources

NEWS.md

@@ -28,6 +28,7 @@
 * Add new date type fields to Instance schema ([MODINVSTOR-1188](https://folio-org.atlassian.net/browse/MODINVSTOR-1188))
 * Implement endpoint for bulk instances upsert from external file ([MODINVSTOR-1225](https://folio-org.atlassian.net/browse/MODINVSTOR-1225))
 * Add Subject source and Subject type to schema ([MODINVSTOR-1205](https://folio-org.atlassian.net/browse/MODINVSTOR-1205))
+* Add codes to Subject sources ([MODINVSTOR-1264](https://folio-org.atlassian.net/browse/MODINVSTOR-1264))
 
 
 ### Bug fixes

ramls/subject-source.json

@@ -7,7 +7,11 @@
       "type": "string"
     },
     "name": {
-      "description": "label for the subject source",
+      "description": "label for the subject source name",
+      "type": "string"
+    },
+    "code": {
+      "description": "label for the subject source code",
       "type": "string"
     },
     "source": {

reference-data/subject-sources/CanadianSubjectHeadings.json

@@ -0,0 +1,6 @@
+{
+  "id": "e894d0dc-621d-4b1d-98f6-6f7120eb0d45",
+  "name": "Canadian Subject Headings",
+  "code" : "cash",
+  "source": "folio"
+}

reference-data/subject-sources/LibraryofCongressChildrensandYoungAdultsSubjectHeadings.json

@@ -0,0 +1,6 @@
+{
+  "id": "e894d0dc-621d-4b1d-98f6-6f7120eb0d41",
+  "name": "Library of Congress Children's and Young Adults' Subject Headings",
+  "code" : "cyac",
+  "source": "folio"
+}

reference-data/subject-sources/LibraryofCongressSubjectHeadings.json

@@ -0,0 +1,6 @@
+{
+  "id": "e894d0dc-621d-4b1d-98f6-6f7120eb0d40",
+  "name": "Library of Congress Subject Headings",
+  "code" : "lcsh",
+  "source": "folio"
+}

reference-data/subject-sources/MedicalSubjectHeadings.json

@@ -0,0 +1,6 @@
+{
+  "id": "e894d0dc-621d-4b1d-98f6-6f7120eb0d42",
+  "name": "Medical Subject Headings",
+  "code" : "mesh",
+  "source": "folio"
+}

reference-data/subject-sources/NationalAgriculturalLibrarysubjectauthorityfile.json

@@ -0,0 +1,5 @@
+{
+  "id": "e894d0dc-621d-4b1d-98f6-6f7120eb0d43",
+  "name": "National Agricultural Library subject authority file",
+  "source": "folio"
+}

reference-data/subject-sources/Repertoiredevedettes-matiere.json

@@ -0,0 +1,6 @@
+{
+  "id": "e894d0dc-621d-4b1d-98f6-6f7120eb0d46",
+  "name": "Répertoire de vedettes-matière",
+  "code" : "rvm",
+  "source": "folio"
+}

reference-data/subject-sources/Sourcenotspecified.json

@@ -0,0 +1,5 @@
+{
+  "id": "e894d0dc-621d-4b1d-98f6-6f7120eb0d44",
+  "name": "Source not specified",
+  "source": "folio"
+}

reference-data/subject-types/Chronologicalterm.json

@@ -0,0 +1,5 @@
+{
+  "id": "d6488f88-1e74-40ce-81b5-b19a928ff5b6",
+  "name": "Chronological term",
+  "source": "folio"
+}

reference-data/subject-types/Corporatename.json

@@ -0,0 +1,5 @@
+{
+  "id": "d6488f88-1e74-40ce-81b5-b19a928ff5b2",
+  "name": "Corporate name",
+  "source": "folio"
+}

reference-data/subject-types/Curriculumobjective.json

@@ -0,0 +1,5 @@
+{
+  "id": "d6488f88-1e74-40ce-81b5-b19a928ff514",
+  "name": "Curriculum objective",
+  "source": "folio"
+}

reference-data/subject-types/Facetedtopicalterms.json

@@ -0,0 +1,5 @@
+{
+  "id": "d6488f88-1e74-40ce-81b5-b19a928ff510",
+  "name": "Faceted topical terms",
+  "source": "folio"
+}

reference-data/subject-types/Function.json

@@ -0,0 +1,5 @@
+{
+  "id": "d6488f88-1e74-40ce-81b5-b19a928ff513",
+  "name": "Function",
+  "source": "folio"
+}

reference-data/subject-types/Genreform.json

@@ -0,0 +1,5 @@
+{
+  "id": "d6488f88-1e74-40ce-81b5-b19a928ff511",
+  "name": "Genre/form",
+  "source": "folio"
+}

reference-data/subject-types/Geographicname.json

@@ -0,0 +1,5 @@
+{
+  "id": "d6488f88-1e74-40ce-81b5-b19a928ff5b8",
+  "name": "Geographic name",
+  "source": "folio"
+}

reference-data/subject-types/Hierarchicalplacename.json

@@ -0,0 +1,5 @@
+{
+  "id": "d6488f88-1e74-40ce-81b5-b19a928ff515",
+  "name": "Hierarchical place name",
+  "source": "folio"
+}

reference-data/subject-types/Meetingname.json

@@ -0,0 +1,5 @@
+{
+  "id": "d6488f88-1e74-40ce-81b5-b19a928ff5b3",
+  "name": "Meeting name",
+  "source": "folio"
+}

reference-data/subject-types/Namedevent.json

@@ -0,0 +1,5 @@
+{
+  "id": "d6488f88-1e74-40ce-81b5-b19a928ff5b5",
+  "name": "Named event",
+  "source": "folio"
+}

reference-data/subject-types/Occupation.json

@@ -0,0 +1,5 @@
+{
+  "id": "d6488f88-1e74-40ce-81b5-b19a928ff512",
+  "name": "Occupation",
+  "source": "folio"
+}

reference-data/subject-types/Personalname.json

@@ -0,0 +1,5 @@
+{
+  "id": "d6488f88-1e74-40ce-81b5-b19a928ff5b1",
+  "name": "Personal name",
+  "source": "folio"
+}

reference-data/subject-types/Typeofentityunspecified.json

@@ -0,0 +1,5 @@
+{
+  "id": "d6488f88-1e74-40ce-81b5-b19a928ff516",
+  "name": "Type of entity unspecified",
+  "source": "folio"
+}

reference-data/subject-types/Uncontrolled.json

@@ -0,0 +1,5 @@
+{
+  "id": "d6488f88-1e74-40ce-81b5-b19a928ff5b9",
+  "name": "Uncontrolled",
+  "source": "folio"
+}

reference-data/subject-types/Uniformtitle.json

@@ -0,0 +1,5 @@
+{
+  "id": "d6488f88-1e74-40ce-81b5-b19a928ff5b4",
+  "name": "Uniform title",
+  "source": "folio"
+}

src/main/resources/templates/db_scripts/addSubjectSources.sql

@@ -1,38 +1,33 @@
 INSERT INTO ${myuniversity}_${mymodule}.subject_source (id, jsonb)
 VALUES ('e894d0dc-621d-4b1d-98f6-6f7120eb0d40',
-        json_build_object('id','e894d0dc-621d-4b1d-98f6-6f7120eb0d40', 'name', 'Library of Congress Subject Headings',  'source', 'folio'))
+        json_build_object('id','e894d0dc-621d-4b1d-98f6-6f7120eb0d40', 'name', 'Library of Congress Subject Headings', 'code', 'lcsh', 'source', 'folio'))
 ON CONFLICT DO NOTHING;
 
 INSERT INTO ${myuniversity}_${mymodule}.subject_source (id, jsonb)
 VALUES ('e894d0dc-621d-4b1d-98f6-6f7120eb0d41',
-        json_build_object('id','e894d0dc-621d-4b1d-98f6-6f7120eb0d41', 'name', 'Library of Congress Children''s and Young Adults'' Subject Headings',  'source', 'folio'))
+        json_build_object('id','e894d0dc-621d-4b1d-98f6-6f7120eb0d41', 'name', 'Library of Congress Children''s and Young Adults'' Subject Headings', 'code', 'cyac', 'source', 'folio'))
 ON CONFLICT DO NOTHING;
 INSERT INTO ${myuniversity}_${mymodule}.subject_source (id, jsonb)
 VALUES ('e894d0dc-621d-4b1d-98f6-6f7120eb0d42',
-        json_build_object('id','e894d0dc-621d-4b1d-98f6-6f7120eb0d42', 'name', 'Medical Subject Headings',  'source', 'folio'))
+        json_build_object('id','e894d0dc-621d-4b1d-98f6-6f7120eb0d42', 'name', 'Medical Subject Headings', 'code', 'mesh', 'source', 'folio'))
 ON CONFLICT DO NOTHING;
 
 INSERT INTO ${myuniversity}_${mymodule}.subject_source (id, jsonb)
 VALUES ('e894d0dc-621d-4b1d-98f6-6f7120eb0d43',
-        json_build_object('id','e894d0dc-621d-4b1d-98f6-6f7120eb0d43', 'name', 'National Agricultural Library subject authority file',  'source', 'folio'))
+        json_build_object('id','e894d0dc-621d-4b1d-98f6-6f7120eb0d43', 'name', 'National Agricultural Library subject authority file', 'source', 'folio'))
 ON CONFLICT DO NOTHING;
 
 INSERT INTO ${myuniversity}_${mymodule}.subject_source (id, jsonb)
 VALUES ('e894d0dc-621d-4b1d-98f6-6f7120eb0d44',
-        json_build_object('id','e894d0dc-621d-4b1d-98f6-6f7120eb0d44', 'name', 'Source not specified',  'source', 'folio'))
+        json_build_object('id','e894d0dc-621d-4b1d-98f6-6f7120eb0d44', 'name', 'Source not specified', 'source', 'folio'))
 ON CONFLICT DO NOTHING;
 
 INSERT INTO ${myuniversity}_${mymodule}.subject_source (id, jsonb)
 VALUES ('e894d0dc-621d-4b1d-98f6-6f7120eb0d45',
-        json_build_object('id','e894d0dc-621d-4b1d-98f6-6f7120eb0d45', 'name', 'Canadian Subject Headings',  'source', 'folio'))
+        json_build_object('id','e894d0dc-621d-4b1d-98f6-6f7120eb0d45', 'name', 'Canadian Subject Headings', 'code', 'cash',  'source', 'folio'))
 ON CONFLICT DO NOTHING;
 
 INSERT INTO ${myuniversity}_${mymodule}.subject_source (id, jsonb)
 VALUES ('e894d0dc-621d-4b1d-98f6-6f7120eb0d46',
-        json_build_object('id','e894d0dc-621d-4b1d-98f6-6f7120eb0d46', 'name', 'Répertoire de vedettes-matière',  'source', 'folio'))
-ON CONFLICT DO NOTHING;
-
-INSERT INTO ${myuniversity}_${mymodule}.subject_source (id, jsonb)
-VALUES ('e894d0dc-621d-4b1d-98f6-6f7120eb0d47',
-        json_build_object('id','e894d0dc-621d-4b1d-98f6-6f7120eb0d47', 'name', 'Source specified in subfield $2',  'source', 'folio'))
+        json_build_object('id','e894d0dc-621d-4b1d-98f6-6f7120eb0d46', 'name', 'Répertoire de vedettes-matière', 'code', 'rvm',  'source', 'folio'))
 ON CONFLICT DO NOTHING;

src/main/resources/templates/db_scripts/schema.json

@@ -914,6 +914,10 @@
         {
           "fieldName": "name",
           "tOps": "ADD"
+        },
+        {
+          "fieldName": "code",
+          "tOps": "ADD"
         }
       ]
     }

src/test/java/org/folio/rest/api/SubjectSourceTest.java

@@ -6,6 +6,7 @@
 import static org.folio.utility.RestUtility.send;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import io.vertx.core.http.HttpMethod;
@@ -51,6 +52,31 @@ public void cannotCreateSubjectSourceWithDuplicateName()
 
     JsonArray errors = response.getJson().getJsonArray("errors");
     assertThat(errors.size(), is(1));
+    assertTrue(errors.getJsonObject(0).getString("message").contains("(jsonb ->> 'name'::text)) value already exists"));
+  }
+
+  @Test
+  public void cannotCreateSubjectSourceWithDuplicateCode()
+    throws InterruptedException, TimeoutException,
+    ExecutionException {
+
+    JsonObject subjectSource = new JsonObject()
+      .put("name", "Test")
+      .put("code", "test")
+      .put("source", "local");
+
+    subjectSourceClient.create(subjectSource);
+
+    CompletableFuture<Response> postCompleted = new CompletableFuture<>();
+    getClient().post(subjectSourcesUrl(""), subjectSource.put("name", "Test2"),
+      TENANT_ID, ResponseHandler.json(postCompleted));
+
+    Response response = postCompleted.get(TIMEOUT, TimeUnit.SECONDS);
+    assertThat(response.getStatusCode(), is(422));
+
+    JsonArray errors = response.getJson().getJsonArray("errors");
+    assertThat(errors.size(), is(1));
+    assertTrue(errors.getJsonObject(0).getString("message").contains("(jsonb ->> 'code'::text)) value already exists"));
   }
 
   @Test

src/test/java/org/folio/rest/impl/SubjectSourcesIT.java

@@ -36,6 +36,7 @@ protected SubjectSource sampleRecord() {
     return new SubjectSource()
       .withId(UUID.randomUUID().toString())
       .withName("test_name")
+      .withCode("test_code")
       .withSource(SubjectSource.Source.LOCAL);
   }
 
@@ -46,7 +47,7 @@ protected Function<SubjectSources, List<SubjectSource>> collectionRecordsExtract
 
   @Override
   protected List<Function<SubjectSource, Object>> recordFieldExtractors() {
-    return List.of(SubjectSource::getName, SubjectSource::getSource);
+    return List.of(SubjectSource::getName, SubjectSource::getCode, SubjectSource::getSource);
   }
 
   @Override
@@ -66,6 +67,6 @@ protected UnaryOperator<SubjectSource> recordModifyingFunction() {
 
   @Override
   protected List<String> queries() {
-    return List.of("name==test_name");
+    return List.of("name==test_name", "code==test_code");
   }
 }