From 93646c66dc0537999d4279fa525b1ecdcf3e382d Mon Sep 17 00:00:00 2001 From: mis306lu Date: Mon, 16 Oct 2023 17:30:32 -0400 Subject: [PATCH 01/16] MODNCIP-62 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 10fd11c..4298309 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ - 4.4.5 + 4.4.6 UTF-8 UTF-8 17 From be1e8265ad4c1f0d829a341267305f8209a25db1 Mon Sep 17 00:00:00 2001 From: mis306lu Date: Mon, 16 Oct 2023 17:30:53 -0400 Subject: [PATCH 02/16] MODNCIP-62 --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 3978eab..63e6086 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -## 1.14.2 2023-10-16 +## 1.14.3 2023-10-16 * [MODNCIP-62](https://issues.folio.org/browse/MODNCIP-62) Upgrade dependencies (Spring, Vert.x, ...) for Poppy ## 1.14.1 2023-10-04 * Fix circulation interface version From 1eb06440b6308461ce30308abfaf8ef30ad557a5 Mon Sep 17 00:00:00 2001 From: mis306lu Date: Mon, 16 Oct 2023 17:49:32 -0400 Subject: [PATCH 03/16] [maven-release-plugin] prepare release v1.14.3 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4298309..e6a0cdd 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.folio mod-ncip - 1.14.3-SNAPSHOT + 1.14.3 NCIP NCIP responder for FOLIO (internal module) @@ -234,7 +234,7 @@ https://github.com/folio-org/mod-ncip scm:git:git://github.com/folio-org/mod-ncip scm:git:git@github.com:folio-org/mod-ncip.git - HEAD + v1.14.3 From 4f3fa86f469c877680e6dea6574293c69898b9f1 Mon Sep 17 00:00:00 2001 From: mis306lu Date: Mon, 16 Oct 2023 17:49:34 -0400 Subject: [PATCH 04/16] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e6a0cdd..e2a0469 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.folio mod-ncip - 1.14.3 + 1.14.4-SNAPSHOT NCIP NCIP responder for FOLIO (internal module) @@ -234,7 +234,7 @@ https://github.com/folio-org/mod-ncip scm:git:git://github.com/folio-org/mod-ncip scm:git:git@github.com:folio-org/mod-ncip.git - v1.14.3 + HEAD From d4fd35291fb705a17fcc8026e3d98ed322b6d1e3 Mon Sep 17 00:00:00 2001 From: mis306lu Date: Wed, 25 Oct 2023 08:53:30 -0400 Subject: [PATCH 05/16] MODNCIP-63 --- NEWS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS.md b/NEWS.md index 63e6086..4864078 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,5 @@ +## 1.14.4 2023-10-25 + * [MODNCIP-63](https://issues.folio.org/browse/MODNCIP-63) Give user.email.type a default value ## 1.14.3 2023-10-16 * [MODNCIP-62](https://issues.folio.org/browse/MODNCIP-62) Upgrade dependencies (Spring, Vert.x, ...) for Poppy ## 1.14.1 2023-10-04 From 4d0955e0b8c9da2c09db36d077c8e4e3b3dc2e04 Mon Sep 17 00:00:00 2001 From: mis306lu Date: Wed, 25 Oct 2023 08:56:21 -0400 Subject: [PATCH 06/16] MODNCIP-63 --- src/main/resources/ncip.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/ncip.properties b/src/main/resources/ncip.properties index c95a866..adc4bc2 100644 --- a/src/main/resources/ncip.properties +++ b/src/main/resources/ncip.properties @@ -16,4 +16,4 @@ checkin.service.point.code response.includes.physical.address=false user.priv.ok.status=ACTIVE user.priv.blocked.status=BLOCKED -user.email.type \ No newline at end of file +user.email.type=electronic mail address From 14d39021660fa308fa3f85ce471c49d96adf03ea Mon Sep 17 00:00:00 2001 From: mis306lu Date: Wed, 25 Oct 2023 08:59:09 -0400 Subject: [PATCH 07/16] spacing --- .../java/org/folio/ncip/services/FolioLookupUserService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/folio/ncip/services/FolioLookupUserService.java b/src/main/java/org/folio/ncip/services/FolioLookupUserService.java index 564d1fa..6deb86b 100644 --- a/src/main/java/org/folio/ncip/services/FolioLookupUserService.java +++ b/src/main/java/org/folio/ncip/services/FolioLookupUserService.java @@ -297,9 +297,9 @@ private UserAddressInformation retrieveEmail(JsonObject jsonObject, String agenc if (ncipProperties != null) { String emailStringConfigValue = ncipProperties.getProperty(agencyId.toLowerCase() + "." + Constants.EMAIL_STRING); if (emailStringConfigValue != null) emailString = emailStringConfigValue; - } + } - JsonObject personal = jsonObject.getJsonObject(Constants.PERSONAL); + JsonObject personal = jsonObject.getJsonObject(Constants.PERSONAL); String emailAddress = personal.getString("email"); //TODO constants ElectronicAddress email = new ElectronicAddress(); email.setElectronicAddressData(emailAddress); From a41e53994f400abe391cfc410b449906b53630bf Mon Sep 17 00:00:00 2001 From: mis306lu Date: Wed, 25 Oct 2023 09:19:24 -0400 Subject: [PATCH 08/16] [maven-release-plugin] prepare release v1.14.4 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e2a0469..66c9da9 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.folio mod-ncip - 1.14.4-SNAPSHOT + 1.14.4 NCIP NCIP responder for FOLIO (internal module) @@ -234,7 +234,7 @@ https://github.com/folio-org/mod-ncip scm:git:git://github.com/folio-org/mod-ncip scm:git:git@github.com:folio-org/mod-ncip.git - HEAD + v1.14.4 From 00d063c25840d9d01b49cf3dbee282bb6b3f53e6 Mon Sep 17 00:00:00 2001 From: mis306lu Date: Wed, 25 Oct 2023 09:19:25 -0400 Subject: [PATCH 09/16] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 66c9da9..2236d66 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.folio mod-ncip - 1.14.4 + 1.14.5-SNAPSHOT NCIP NCIP responder for FOLIO (internal module) @@ -234,7 +234,7 @@ https://github.com/folio-org/mod-ncip scm:git:git://github.com/folio-org/mod-ncip scm:git:git@github.com:folio-org/mod-ncip.git - v1.14.4 + HEAD From 245bcdd337e9f2153bf16ba08b0706191e3578de Mon Sep 17 00:00:00 2001 From: mis306lu Date: Thu, 28 Mar 2024 10:56:36 -0400 Subject: [PATCH 10/16] MODNCIP-65 use preferredFirstName --- .../java/org/folio/ncip/services/FolioLookupUserService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/folio/ncip/services/FolioLookupUserService.java b/src/main/java/org/folio/ncip/services/FolioLookupUserService.java index 6deb86b..0a83101 100644 --- a/src/main/java/org/folio/ncip/services/FolioLookupUserService.java +++ b/src/main/java/org/folio/ncip/services/FolioLookupUserService.java @@ -240,6 +240,8 @@ private NameInformation retrieveName(JsonObject jsonObject) { JsonObject personal = jsonObject.getJsonObject("personal"); //TODO constants String firstName = personal.getString("firstName"); String lastName = personal.getString("lastName"); + if (personal.getString("preferredFirstName") != null && !personal.getString("preferredFirstName").isEmpty()) + firstName = personal.getString("preferredFirstName"); NameInformation nameInformation = new NameInformation(); PersonalNameInformation personalNameInformation = new PersonalNameInformation(); StructuredPersonalUserName structuredPersonalUserName = new StructuredPersonalUserName(); From 1c7c02ba254f7129376c748f0880de26edb99349 Mon Sep 17 00:00:00 2001 From: mis306lu Date: Thu, 28 Mar 2024 11:08:40 -0400 Subject: [PATCH 11/16] use constant --- src/main/java/org/folio/ncip/Constants.java | 1 + .../java/org/folio/ncip/services/FolioLookupUserService.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/folio/ncip/Constants.java b/src/main/java/org/folio/ncip/Constants.java index 42ebc3d..969e10a 100644 --- a/src/main/java/org/folio/ncip/Constants.java +++ b/src/main/java/org/folio/ncip/Constants.java @@ -22,6 +22,7 @@ public class Constants { public static final String USERID = "Userid"; public static final String USER_NOT_FOUND = "Did not find a user with that id"; public static final String PERSONAL = "personal"; + public static final String PREFERRED_FIRST_NAME = "preferredFirstName"; public static final String CAMPUS = "CAMPUS"; public static final String OTHER = "OTH"; public static final String USER_PROBLEM_ELEMENT = "AuthenticationInput or UserId"; diff --git a/src/main/java/org/folio/ncip/services/FolioLookupUserService.java b/src/main/java/org/folio/ncip/services/FolioLookupUserService.java index 0a83101..8a6671d 100644 --- a/src/main/java/org/folio/ncip/services/FolioLookupUserService.java +++ b/src/main/java/org/folio/ncip/services/FolioLookupUserService.java @@ -240,8 +240,8 @@ private NameInformation retrieveName(JsonObject jsonObject) { JsonObject personal = jsonObject.getJsonObject("personal"); //TODO constants String firstName = personal.getString("firstName"); String lastName = personal.getString("lastName"); - if (personal.getString("preferredFirstName") != null && !personal.getString("preferredFirstName").isEmpty()) - firstName = personal.getString("preferredFirstName"); + if (personal.getString(Constants.PREFERRED_FIRST_NAME) != null && !personal.getString(Constants.PREFERRED_FIRST_NAME).isEmpty()) + firstName = personal.getString(Constants.PREFERRED_FIRST_NAME); NameInformation nameInformation = new NameInformation(); PersonalNameInformation personalNameInformation = new PersonalNameInformation(); StructuredPersonalUserName structuredPersonalUserName = new StructuredPersonalUserName(); From 813a9f11a5f7403cd05aabb3a4d5b3bc66d57241 Mon Sep 17 00:00:00 2001 From: mis306lu Date: Thu, 4 Apr 2024 16:23:28 -0400 Subject: [PATCH 12/16] update news - MODNCIP-65 --- NEWS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS.md b/NEWS.md index 4864078..c8f226c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,5 @@ +## 1.14.5 2024-04-04 + * [MODNCIP-65](https://folio-org.atlassian.net/browse/MODNCIP-65) if preferredFirstName is present use in lookupUserResponse ## 1.14.4 2023-10-25 * [MODNCIP-63](https://issues.folio.org/browse/MODNCIP-63) Give user.email.type a default value ## 1.14.3 2023-10-16 From 061640e505c0a22d9b8576e89aa5b86a17adf74b Mon Sep 17 00:00:00 2001 From: mis306lu Date: Thu, 4 Apr 2024 16:34:12 -0400 Subject: [PATCH 13/16] [maven-release-plugin] prepare release v1.14.5 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2236d66..f0f4d9b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.folio mod-ncip - 1.14.5-SNAPSHOT + 1.14.5 NCIP NCIP responder for FOLIO (internal module) @@ -234,7 +234,7 @@ https://github.com/folio-org/mod-ncip scm:git:git://github.com/folio-org/mod-ncip scm:git:git@github.com:folio-org/mod-ncip.git - HEAD + v1.14.5 From 01774a460e63d18c36e88564820915d03931b70b Mon Sep 17 00:00:00 2001 From: mis306lu Date: Thu, 4 Apr 2024 16:34:14 -0400 Subject: [PATCH 14/16] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f0f4d9b..4f67b98 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.folio mod-ncip - 1.14.5 + 1.14.6-SNAPSHOT NCIP NCIP responder for FOLIO (internal module) @@ -234,7 +234,7 @@ https://github.com/folio-org/mod-ncip scm:git:git://github.com/folio-org/mod-ncip scm:git:git@github.com:folio-org/mod-ncip.git - v1.14.5 + HEAD From 3f00477f7571c7c13cd7a9d4648171f0aaa24691 Mon Sep 17 00:00:00 2001 From: mis306lu Date: Thu, 2 May 2024 13:34:34 -0400 Subject: [PATCH 15/16] MODNCIP-67 --- descriptors/ModuleDescriptor-template.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json index 637efb4..3d8ffcd 100644 --- a/descriptors/ModuleDescriptor-template.json +++ b/descriptors/ModuleDescriptor-template.json @@ -101,7 +101,7 @@ }, { "id":"circulation", - "version":"12.0 13.0 14.0" + "version":"14.0" } ], "permissionSets": [ From 887c0b54fb3a4adb72e8df85a8506f4bd817ddcb Mon Sep 17 00:00:00 2001 From: mis306lu Date: Thu, 2 May 2024 13:51:27 -0400 Subject: [PATCH 16/16] Update NEWS.md MODNCIP-67 --- NEWS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS.md b/NEWS.md index c8f226c..bb4d1e8 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,5 @@ +## 1.14.6 2024-05-02 + * [MODNCIP-67](https://folio-org.atlassian.net/browse/MODNCIP-67) mod-ncip v1.14.X asserts compatibility with circulation interface v12 and 13 but actually requires v14 ## 1.14.5 2024-04-04 * [MODNCIP-65](https://folio-org.atlassian.net/browse/MODNCIP-65) if preferredFirstName is present use in lookupUserResponse ## 1.14.4 2023-10-25