Merge branch 'PR-1709-dev' into development

indexdata · Sep 3, 2024 · c21c095 · c21c095
2 parents bbc2654 + 8379f1f
commit c21c095
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 53 deletions.
diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>17</java.version>
-		<org.extensiblecatalog.ncip.v2.version>1.3.0-i</org.extensiblecatalog.ncip.v2.version>
+		<org.extensiblecatalog.ncip.v2.version>4.1.0</org.extensiblecatalog.ncip.v2.version>
 	</properties>
 
 	<dependencyManagement>
@@ -72,7 +72,7 @@
 		<dependency>
 			<groupId>org.extensiblecatalog.ncip.v2</groupId>
 			<artifactId>binding-jar</artifactId>
-			<version>4.0.0</version>
+			<version>${org.extensiblecatalog.ncip.v2.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.extensiblecatalog.ncip.v2</groupId>
@@ -212,11 +212,6 @@
 			<name>FOLIO Maven repository</name>
 			<url>https://repository.folio.org/repository/maven-folio</url>
 		</repository>
-		<repository>
-			<id>indexdata-repo</id>
-			<name>Indexdata reposilite</name>
-			<url>https://reposilite.reshare.indexdata.com/releases</url>
-		</repository>
 	</repositories>
 
 	<distributionManagement>

diff --git a/src/main/java/org/folio/ncip/services/CreateUserFiscalTransactionService.java b/src/main/java/org/folio/ncip/services/CreateUserFiscalTransactionService.java
diff --git a/src/main/java/org/folio/ncip/services/DeleteItemService.java b/src/main/java/org/folio/ncip/services/DeleteItemService.java
diff --git a/src/main/java/org/folio/ncip/services/FolioCheckInItemService.java b/src/main/java/org/folio/ncip/services/FolioCheckInItemService.java
@@ -20,6 +20,7 @@
 import org.extensiblecatalog.ncip.v2.service.UserId;
 import org.extensiblecatalog.ncip.v2.service.UserIdentifierType;
 import org.extensiblecatalog.ncip.v2.service.UserOptionalFields;
+import org.extensiblecatalog.ncip.v2.service.Version2ItemIdentifierType;
 import org.folio.ncip.Constants;
 import org.folio.ncip.FolioRemoteServiceManager;
 
@@ -92,17 +93,15 @@ public CheckInItemResponseData performService(CheckInItemInitiationData initData
 				String loanUuid = checkInResponseDetails.getJsonObject("loan").getString("id");
 				String userUuid = checkInResponseDetails.getJsonObject("loan").getString("userId");
 
-				UserId loanId = new UserId();
-				loanId.setUserIdentifierValue(loanUuid);
-				loanId.setUserIdentifierType(new UserIdentifierType(Constants.SCHEME, "loanUuid"));
+				ItemId loanId = new ItemId();
+				loanId.setItemIdentifierValue(loanUuid);
+				loanId.setItemIdentifierType(Version2ItemIdentifierType.UUID);
+				checkInItemResponseData.setLoanUuid(loanId);
 
-				UserId userId = new UserId();
-				userId.setUserIdentifierValue(userUuid);
-				userId.setUserIdentifierType(new UserIdentifierType(Constants.SCHEME, "userUuid"));
-
-				UserOptionalFields userOptionalFields = new UserOptionalFields();
-				userOptionalFields.setUserIds(List.of(loanId, userId));
-				checkInItemResponseData.setUserOptionalFields(userOptionalFields);
+				UserId userUuidObject = new UserId();
+				userUuidObject.setUserIdentifierValue(userUuid);
+				userUuidObject.setUserIdentifierType(new UserIdentifierType(Constants.SCHEME, "userUuid"));
+				checkInItemResponseData.setUserUuid(userUuidObject);
 			}
 
 			checkInItemResponseData.setItemId(iId);

diff --git a/src/main/java/org/folio/ncip/services/FolioCheckOutItemService.java b/src/main/java/org/folio/ncip/services/FolioCheckOutItemService.java
@@ -22,6 +22,7 @@
 import org.extensiblecatalog.ncip.v2.service.UserId;
 import org.extensiblecatalog.ncip.v2.service.UserIdentifierType;
 import org.extensiblecatalog.ncip.v2.service.UserOptionalFields;
+import org.extensiblecatalog.ncip.v2.service.Version2ItemIdentifierType;
 import org.folio.ncip.Constants;
 import org.folio.ncip.FolioRemoteServiceManager;
 
@@ -116,12 +117,10 @@ public CheckOutItemResponseData performService(CheckOutItemInitiationData initDa
 		responseData.setDateDue(calendar);
 		responseData.setItemId(iId);
 		responseData.setUserId(uId);
-		UserId loanId = new UserId();
-		loanId.setUserIdentifierValue(loanUuid);
-		loanId.setUserIdentifierType(new UserIdentifierType(Constants.SCHEME, "loanUuid"));
-		UserOptionalFields userOptionalFields = new UserOptionalFields();
-		userOptionalFields.setUserIds(List.of(loanId));
-		responseData.setUserOptionalFields(userOptionalFields);
+		ItemId loanId = new ItemId();
+		loanId.setItemIdentifierValue(loanUuid);
+		loanId.setItemIdentifierType(Version2ItemIdentifierType.UUID);
+		responseData.setLoanUuid(loanId);
 
 		return responseData;
 	 }

diff --git a/src/main/java/org/folio/ncip/services/FolioCreateUserFiscalTransactionService.java b/src/main/java/org/folio/ncip/services/FolioCreateUserFiscalTransactionService.java
@@ -4,6 +4,7 @@
 import org.apache.log4j.Logger;
 import org.extensiblecatalog.ncip.v2.service.CreateUserFiscalTransactionInitiationData;
 import org.extensiblecatalog.ncip.v2.service.CreateUserFiscalTransactionResponseData;
+import org.extensiblecatalog.ncip.v2.service.CreateUserFiscalTransactionService;
 import org.extensiblecatalog.ncip.v2.service.FiscalTransactionReferenceId;
 import org.extensiblecatalog.ncip.v2.service.Problem;
 import org.extensiblecatalog.ncip.v2.service.ProblemType;
@@ -12,13 +13,11 @@
 import org.extensiblecatalog.ncip.v2.service.ServiceException;
 import org.extensiblecatalog.ncip.v2.service.UserId;
 import org.extensiblecatalog.ncip.v2.service.UserIdentifierType;
-import org.extensiblecatalog.ncip.v2.service.UserOptionalFields;
 import org.extensiblecatalog.ncip.v2.service.ValidationException;
 import org.folio.ncip.Constants;
 import org.folio.ncip.FolioRemoteServiceManager;
 
 import java.util.ArrayList;
-import java.util.List;
 
 public class FolioCreateUserFiscalTransactionService extends FolioNcipService implements CreateUserFiscalTransactionService {
     private static final Logger LOGGER = Logger.getLogger(FolioCreateUserFiscalTransactionService.class);

diff --git a/src/main/java/org/folio/ncip/services/FolioDeleteItemService.java b/src/main/java/org/folio/ncip/services/FolioDeleteItemService.java
@@ -1,8 +1,6 @@
 package org.folio.ncip.services;
 
-import io.vertx.core.json.JsonObject;
 import org.apache.log4j.Logger;
-import org.extensiblecatalog.ncip.v2.service.CancelRequestItemResponseData;
 import org.extensiblecatalog.ncip.v2.service.DeleteItemInitiationData;
 import org.extensiblecatalog.ncip.v2.service.DeleteItemResponseData;
 import org.extensiblecatalog.ncip.v2.service.ItemId;
@@ -12,6 +10,7 @@
 import org.extensiblecatalog.ncip.v2.service.ServiceContext;
 import org.extensiblecatalog.ncip.v2.service.ServiceException;
 import org.extensiblecatalog.ncip.v2.service.ValidationException;
+import org.extensiblecatalog.ncip.v2.service.DeleteItemService;
 import org.folio.ncip.Constants;
 import org.folio.ncip.FolioRemoteServiceManager;