Skip to content

Commit

Permalink
MODNCIP-39
Browse files Browse the repository at this point in the history
  • Loading branch information
mis306lu committed Aug 29, 2022
1 parent d71c793 commit efe7e7e
Show file tree
Hide file tree
Showing 58 changed files with 1,747 additions and 19 deletions.
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## 1.11.1 2022-08-29
* [MODNCIP-39](https://issues.folio.org/browse/MODNCIP-39) - Dependency vulnerabilities
## 1.11.0 2022-06-24
* [MODNCIP-40](https://issues.folio.org/browse/MODNCIP-40) - mod-ncip - Morning Glory 2022 R2 - Vert.x 3.9.9/v4 upgrade
## 1.10.0 2022-02-24
Expand Down
43 changes: 24 additions & 19 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</licenses>

<properties>
<vertx.version>4.1.1</vertx.version>
<vertx.version>4.3.1</vertx.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>11</java.version>
Expand All @@ -41,16 +41,16 @@
</dependency>
<!--ncip toolkit dependencies start -->
<dependency>
<groupId>net.sf.dozer</groupId>
<artifactId>dozer</artifactId>
<version>5.3.2</version>
<exclusions>
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</exclusion>
</exclusions>
</dependency>
<groupId>net.sf.dozer</groupId>
<artifactId>dozer</artifactId>
<version>5.3.2</version>
<exclusions>
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
Expand All @@ -59,42 +59,42 @@
<dependency>
<groupId>org.extensiblecatalog.ncip.v2</groupId>
<artifactId>binding-jar</artifactId>
<version>2.1.0-20220826.154735-5</version>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.extensiblecatalog.ncip.v2</groupId>
<artifactId>binding-ilsdiv1_0_bc</artifactId>
<version>2.1.0-20220826.154744-5</version>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.extensiblecatalog.ncip.v2</groupId>
<artifactId>binding-ncipv2_01</artifactId>
<version>2.1.0-20220826.154739-5</version>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.extensiblecatalog.ncip.v2</groupId>
<artifactId>binding-ilsdiv1_0</artifactId>
<version>2.1.0-20220826.154742-5</version>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.extensiblecatalog.ncip.v2</groupId>
<artifactId>binding-ncipv2_02</artifactId>
<version>2.1.0-20220826.154740-5</version>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.extensiblecatalog.ncip.v2</groupId>
<artifactId>binding-wclv1_0</artifactId>
<version>2.0.0</version>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.extensiblecatalog.ncip.v2</groupId>
<artifactId>common</artifactId>
<version>2.1.0-20220826.154735-5</version>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.extensiblecatalog.ncip.v2</groupId>
<artifactId>service</artifactId>
<version>2.1.0-20220826.154735-5</version>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
Expand Down Expand Up @@ -133,6 +133,11 @@
<artifactId>log4j-api</artifactId>
<version>2.17.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
Expand Down
66 changes: 66 additions & 0 deletions target/surefire-reports/TEST-org.folio.ncip.MainVerticleTest.xml

Large diffs are not rendered by default.

461 changes: 461 additions & 0 deletions target/surefire-reports/TEST-org.folio.ncip.NcipTestSuite.xml

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions target/surefire-reports/org.folio.ncip.NcipTestSuite.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-------------------------------------------------------------------------------
Test set: org.folio.ncip.NcipTestSuite
-------------------------------------------------------------------------------
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.319 s - in org.folio.ncip.NcipTestSuite
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-------------------------------------------------------------------------------
Test set: org.folio.ncip.services.AcceptItemServiceTests
-------------------------------------------------------------------------------
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.005 s - in org.folio.ncip.services.AcceptItemServiceTests
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-------------------------------------------------------------------------------
Test set: org.folio.ncip.services.CheckinItemServiceTest
-------------------------------------------------------------------------------
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 s - in org.folio.ncip.services.CheckinItemServiceTest
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-------------------------------------------------------------------------------
Test set: org.folio.ncip.services.CheckoutItemServiceTest
-------------------------------------------------------------------------------
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.004 s - in org.folio.ncip.services.CheckoutItemServiceTest
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-------------------------------------------------------------------------------
Test set: org.folio.ncip.services.LookupUserServiceTests
-------------------------------------------------------------------------------
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.003 s - in org.folio.ncip.services.LookupUserServiceTests
37 changes: 37 additions & 0 deletions target/test-classes/mockdata/accounts-get-large-fine.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"accounts" : [ {
"amount" : 650.5,
"remaining" : 650.5,
"status" : {
"name" : "Open"
},
"paymentStatus" : {
"name" : "Outstanding"
},
"feeFineType" : "LOST",
"feeFineOwner" : "LIBRARY",
"title" : "TEST ONE",
"barcode" : "LEH-20191003227",
"materialType" : "PALCI",
"location" : "PALCI Shelf",
"metadata" : {
"createdDate" : "2019-10-08T18:10:33.171+0000",
"createdByUserId" : "99999999-9999-1999-8999-999999999901",
"updatedDate" : "2019-10-08T18:10:33.171+0000",
"updatedByUserId" : "99999999-9999-1999-8999-999999999901"
},
"loanId" : "0",
"userId" : "3eca41e7-c93b-47fa-a975-1fa77966a6af",
"itemId" : "1c9b504b-4cc5-43c9-9035-fad3f8720ffd",
"materialTypeId" : "4e5f8d5d-b170-4a20-a763-a87fcdb0bb32",
"feeFineId" : "e75d7c95-3e41-4397-b398-44b8cee569b8",
"ownerId" : "2c222765-5f66-4da2-9d7b-1152edeedc6f",
"id" : "b90c1144-49ef-4498-9d3d-b1be7369f344"
} ],
"totalRecords" : 1,
"resultInfo" : {
"totalRecords" : 1,
"facets" : [ ],
"diagnostics" : [ ]
}
}
37 changes: 37 additions & 0 deletions target/test-classes/mockdata/accounts-get.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"accounts" : [ {
"amount" : 2.5,
"remaining" : 2.5,
"status" : {
"name" : "Open"
},
"paymentStatus" : {
"name" : "Outstanding"
},
"feeFineType" : "LOST",
"feeFineOwner" : "LIBRARY",
"title" : "TEST ONE",
"barcode" : "LEH-20191003227",
"materialType" : "PALCI",
"location" : "PALCI Shelf",
"metadata" : {
"createdDate" : "2019-10-08T18:10:33.171+0000",
"createdByUserId" : "99999999-9999-1999-8999-999999999901",
"updatedDate" : "2019-10-08T18:10:33.171+0000",
"updatedByUserId" : "99999999-9999-1999-8999-999999999901"
},
"loanId" : "0",
"userId" : "3eca41e7-c93b-47fa-a975-1fa77966a6af",
"itemId" : "1c9b504b-4cc5-43c9-9035-fad3f8720ffd",
"materialTypeId" : "4e5f8d5d-b170-4a20-a763-a87fcdb0bb32",
"feeFineId" : "e75d7c95-3e41-4397-b398-44b8cee569b8",
"ownerId" : "2c222765-5f66-4da2-9d7b-1152edeedc6f",
"id" : "b90c1144-49ef-4498-9d3d-b1be7369f344"
} ],
"totalRecords" : 1,
"resultInfo" : {
"totalRecords" : 1,
"facets" : [ ],
"diagnostics" : [ ]
}
}
9 changes: 9 additions & 0 deletions target/test-classes/mockdata/automatedBlocks-get-blocked.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"automatedPatronBlocks" : [ {
"patronBlockConditionId" : "3d7c52dc-c732-4223-8bf8-e5917801386f",
"blockBorrowing" : true,
"blockRenewals" : true,
"blockRequests" : true,
"message" : "too many items checked out"
} ]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"automatedPatronBlocks" : [ ],
"totalRecords" : 0
}
Empty file.
49 changes: 49 additions & 0 deletions target/test-classes/mockdata/checkOutByBarcode-post.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"id" : "bb4488b5-c399-4092-8d33-25e29842d9d7",
"userId" : "99999999-9999-1999-8999-999999999901",
"itemId" : "b195771a-6c54-43dc-802e-b20cbc5b34ff",
"status" : {
"name" : "Open"
},
"loanDate" : "2019-10-03T15:24:24",
"dueDate" : "2020-01-10T23:59:59.000+0000",
"action" : "checkedout",
"loanPolicyId" : "b3d3e18a-9bf4-401c-a5b3-b88dd5653858",
"checkoutServicePointId" : "29faacf1-4ba4-42c7-8b2a-566b259e4641",
"metadata" : {
"createdDate" : "2019-10-03T19:24:26.616+0000",
"createdByUserId" : "99999999-9999-1999-8999-999999999901",
"updatedDate" : "2019-10-03T19:24:26.616+0000",
"updatedByUserId" : "99999999-9999-1999-8999-999999999901"
},
"item" : {
"id" : "b195771a-6c54-43dc-802e-b20cbc5b34ff",
"holdingsRecordId" : "09065bab-34dd-438e-95be-79eccc1f95aa",
"instanceId" : "97e40763-b77c-4fe5-baf5-4d2655e92add",
"title" : "TEST ONE",
"barcode" : "LEH-20191003225",
"callNumber" : "LEH-20191003225",
"status" : {
"name" : "Checked out"
},
"location" : {
"name" : "PALCI Shelf"
},
"materialType" : {
"name" : "PALCI"
}
},
"borrower" : {
"firstName" : "Doe",
"lastName" : "Jane",
"middleName" : null,
"barcode" : "8377630"
},
"patronGroupAtCheckout" : {
"id" : "dac3aab4-7a86-422b-b5fc-6fbf7afd7aeb",
"name" : "GRAD"
},
"loanPolicy" : {
"name" : "Example Loan Policy"
}
}
46 changes: 46 additions & 0 deletions target/test-classes/mockdata/circ-requests-post.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"id" : "4e2db869-4b9c-400f-8026-4247d5f525c8",
"requestType" : "Page",
"requestDate" : "2019-10-03T15:21:58.000+0000",
"requesterId" : "99999999-9999-1999-8999-999999999901",
"itemId" : "16fdfb9f-b6ce-4fd7-a3f5-780b0e838fc9",
"status" : "Open - Not yet filled",
"item" : {
"title" : "TEST ONE",
"barcode" : "LEH-20191003224",
"holdingsRecordId" : "0f109dcb-104d-4976-bb66-e079d77bbc10",
"instanceId" : "6638d356-38dc-425e-8ddb-72482da69756",
"location" : {
"name" : "PALCI Shelf",
"libraryName" : "Linderman",
"code" : "PALCI_LEHIGH"
},
"contributorNames" : [ ],
"status" : "Paged",
"callNumber" : "LEH-20191003224",
"copyNumbers" : [ null ]
},
"requester" : {
"lastName" : "Jane",
"firstName" : "Doe",
"barcode" : "8377630",
"patronGroupId" : "dac3aab4-7a86-422b-b5fc-6fbf7afd7aeb"
},
"fulfilmentPreference" : "Hold Shelf",
"pickupServicePointId" : "29faacf1-4ba4-42c7-8b2a-566b259e4641",
"metadata" : {
"createdDate" : "2019-10-03T19:21:59.707+0000",
"createdByUserId" : "99999999-9999-1999-8999-999999999901",
"updatedDate" : "2019-10-03T19:21:59.707+0000",
"updatedByUserId" : "99999999-9999-1999-8999-999999999901"
},
"position" : 1,
"pickupServicePoint" : {
"name" : "Fairchild Martindale",
"code" : "FAIRCHILD",
"discoveryDisplayName" : "Fairchild Martindale",
"description" : null,
"shelvingLagTime" : 10,
"pickupLocation" : true
}
}
5 changes: 5 additions & 0 deletions target/test-classes/mockdata/groups-get.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"group" : "GRAD",
"desc" : "GRAD",
"id" : "dac3aab4-7a86-422b-b5fc-6fbf7afd7aeb"
}
19 changes: 19 additions & 0 deletions target/test-classes/mockdata/holdings-storage-holdings-post.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"id" : "8b3d8d4b-5c4b-48a3-b375-65c5128f221e",
"formerIds" : [ ],
"instanceId" : "637fb781-14b2-4d8f-9515-fe913efd5c66",
"electronicAccess" : [ ],
"notes" : [ ],
"holdingsStatements" : [ ],
"holdingsStatementsForIndexes" : [ ],
"holdingsStatementsForSupplements" : [ ],
"discoverySuppress" : true,
"statisticalCodeIds" : [ ],
"holdingsItems" : [ ],
"metadata" : {
"createdDate" : "2019-09-20T15:31:45.885+0000",
"createdByUserId" : "99999999-9999-9999-9999-999999999901",
"updatedDate" : "2019-09-20T15:31:45.885+0000",
"updatedByUserId" : "99999999-9999-9999-9999-999999999901"
}
}
14 changes: 14 additions & 0 deletions target/test-classes/mockdata/identifierTypes-get.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"identifierTypes" : [ {
"id" : "b414359d-8108-4760-9e5e-6ae2e8fee7f8",
"name" : "PALCI Request ID",
"source" : "local",
"metadata" : {
"createdDate" : "2019-10-03T18:51:32.755+0000",
"createdByUserId" : "99999999-9999-1999-8999-999999999901",
"updatedDate" : "2019-10-03T18:51:32.755+0000",
"updatedByUserId" : "99999999-9999-1999-8999-999999999901"
}
} ],
"totalRecords" : 1
}
15 changes: 15 additions & 0 deletions target/test-classes/mockdata/instanceTypes-get.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"instanceTypes" : [ {
"id" : "660a0ba9-b951-4391-b001-bcf6062def23",
"name" : "palci",
"code" : "palci",
"source" : "local",
"metadata" : {
"createdDate" : "2019-10-03T19:02:53.870+0000",
"createdByUserId" : "99999999-9999-1999-8999-999999999901",
"updatedDate" : "2019-10-03T19:02:53.870+0000",
"updatedByUserId" : "99999999-9999-1999-8999-999999999901"
}
} ],
"totalRecords" : 1
}
Loading

0 comments on commit efe7e7e

Please sign in to comment.