Skip to content

Commit

Permalink
Merge branch 'master' of github.com:folio-org/mod-orders into MODDATA…
Browse files Browse the repository at this point in the history
…IMP-1010
  • Loading branch information
RuslanLavrov committed Apr 17, 2024
2 parents 9ca7536 + fffbb4d commit f421f78
Show file tree
Hide file tree
Showing 65 changed files with 2,829 additions and 448 deletions.
72 changes: 71 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,75 @@
## 12.8.0 - Unreleased
## 12.9.0 - Unreleased

## 12.8.0 - Released (Quesnelia R1 2024)
This release focused on fixing several bugs as well as implement new features and upgrading dependent libraries

[Full Changelog](https://github.com/folio-org/mod-orders/compare/v12.7.0...v12.8.0)

### New APIs versions

* Requires `orders-storage.pieces v5.0`
* Requires `orders-storage.receiving-history v4.0`
* Requires `orders-storage.po-line-number v2.0`
* Requires `orders-storage.order-invoice-relationships v1.0`
* Requires `finance.fiscal-years v2.0`
* Requires `finance-storage.ledgers v4.0`
* Provides `orders.receiving v2.0`
* Provides `orders.pieces v3.0`

### Stories

* [MODORDERS-1052](https://folio-org.atlassian.net/browse/MODORDERS-1052) - Upgrade RAML Module Builder for Quesnelia
* [MODORDERS-1044](https://folio-org.atlassian.net/browse/MODORDERS-1044) - Do not update orderStatus for past fiscal years
* [MODORDERS-1043](https://folio-org.atlassian.net/browse/MODORDERS-1043) - Remove pending payment encumbrance links when encumbrances are deleted
* [MODORDERS-1036](https://folio-org.atlassian.net/browse/MODORDERS-1036) - Include already existing holdings to validation process
* [MODORDERS-1032](https://folio-org.atlassian.net/browse/MODORDERS-1032) - Protect Holdings Receiving Histrory with Title acq units
* [MODORDERS-1031](https://folio-org.atlassian.net/browse/MODORDERS-1031) - Create Kafka topics instead of relying on auto create in mod-orders
* [MODORDERS-1028](https://folio-org.atlassian.net/browse/MODORDERS-1028) - Add specific error code of barcode uniqueness error error during receiving
* [MODORDERS-1027](https://folio-org.atlassian.net/browse/MODORDERS-1027) - Add logic to update POL receipt status when moving pieces between Unreceivable and Expected
* [MODORDERS-1022](https://folio-org.atlassian.net/browse/MODORDERS-1022) - Add receipt Date to the CheckIng Piece schema
* [MODORDERS-1020](https://folio-org.atlassian.net/browse/MODORDERS-1020) - Adjust Restricted Location + Fund validation rules
* [MODORDERS-1010](https://folio-org.atlassian.net/browse/MODORDERS-1010) - Change "caption" to "Display summary" for checkin and receiving collections
* [MODORDERS-1005](https://folio-org.atlassian.net/browse/MODORDERS-1005) - Check acq units from Title when receiving/unreceicing pieces
* [MODORDERS-1000](https://folio-org.atlassian.net/browse/MODORDERS-1000) - Populate Item "Display summary" field with Piece "Display summary" field value
* [MODORDERS-989](https://folio-org.atlassian.net/browse/MODORDERS-989) - Implement batch endpoint to move multiple pieces to Expected status
* [MODORDERS-985](https://folio-org.atlassian.net/browse/MODORDERS-985) - Add internal note and external note in Piece schema
* [MODORDERS-983](https://folio-org.atlassian.net/browse/MODORDERS-983) - Receiving a piece on a closed/cancelled PO will reopen the PO
* [MODORDERS-980](https://folio-org.atlassian.net/browse/MODORDERS-980) - Update dto schema with recent changes for holdingsItems
* [MODORDERS-974](https://folio-org.atlassian.net/browse/MODORDERS-974) - Add validation for claimingActive, claimingInterval fields
* [MODORDERS-972](https://folio-org.atlassian.net/browse/MODORDERS-972) - Protect Title acq units management with permissions
* [MODORDERS-970](https://folio-org.atlassian.net/browse/MODORDERS-970) - Do not overwrite Item fields when piece fields are null/empty
* [MODORDERS-969](https://folio-org.atlassian.net/browse/MODORDERS-969) - Opening and editing POs with location-restricted funds
* [MODORDERS-963](https://folio-org.atlassian.net/browse/MODORDERS-963) - Update PUT piece to check acq unit from title instead of order
* [MODORDERS-962](https://folio-org.atlassian.net/browse/MODORDERS-962) - Update Get titles query to check acq units from title instead of purchase order
* [MODORDERS-892](https://folio-org.atlassian.net/browse/MODORDERS-892) - Accumulate all transactions in holder to make only single call to mod-finance
* [MODORDERS-886](https://folio-org.atlassian.net/browse/MODORDERS-886) - The unclear error message is displayed when a user is trying to save the order template with already existing name
* [MODORDERS-846](https://folio-org.atlassian.net/browse/MODORDERS-846) - Add validation back for deleting encumbrance when expended > 0
* [MODORDSTOR-360](https://folio-org.atlassian.net/browse/MODORDSTOR-360) - Inherit acqUnitIds from Purchase Order when creating new Title
* [MODDATAIMP-957](https://folio-org.atlassian.net/browse/MODDATAIMP-957) - Test, make adjustments and merge PRs for removing initial saving of records in SRS

### Bug Fixes

* [MODORDERS-1055](https://folio-org.atlassian.net/browse/MODORDERS-1055) - orderStatus is not always updated when reopening an order
* [MODORDERS-1053](https://folio-org.atlassian.net/browse/MODORDERS-1053) - Missing interface dependencies in module descriptor
* [MODORDERS-1049](https://folio-org.atlassian.net/browse/MODORDERS-1049) - Rollback inventory if open fails to create encumbrances
* [MODORDERS-1039](https://folio-org.atlassian.net/browse/MODORDERS-1039) - Encumbrance expense class not updated after a change to the fund distribution
* [MODORDERS-1030](https://folio-org.atlassian.net/browse/MODORDERS-1030) - "Receipt status" is changed to "Fully received" when all piece statuses for selected title were changed to "Claim delayed" and "Claim sent"
* [MODORDERS-1024](https://folio-org.atlassian.net/browse/MODORDERS-1024) - Error message appears when open unopened (duplicated) P/E mix order with same location both for physical and electronic resources
* [MODORDERS-986](https://folio-org.atlassian.net/browse/MODORDERS-986) - Error thrown during change instance connection
* [MODORDERS-984](https://folio-org.atlassian.net/browse/MODORDERS-984) - Reciept status remains "Fully received" after unreceiving piece
* [MODORDERS-967](https://folio-org.atlassian.net/browse/MODORDERS-967) - Defect in Order Receipt Status Update for 'Ongoing' Orders
* [MODORDERS-669](https://folio-org.atlassian.net/browse/MODORDERS-669) - Cannot delete a piece in receiving
* [MODDICORE-373](https://folio-org.atlassian.net/browse/MODDICORE-373) - The import of file is completed with errors

### Tech debts

* [MODORDERS-852](https://folio-org.atlassian.net/browse/MODORDERS-852) - Some unit tests are not executed

### Dependencies

* Bump `raml` from `35.0.1` to `35.2.0`
* Bump `vertx` from `4.3.4` to `4.5.4`
* Bump `data-import-processing-core` from `4.1.0` to `4.2.0`

## 12.7.0 - Released (Poppy R2 2023)

Expand Down
149 changes: 137 additions & 12 deletions descriptors/ModuleDescriptor-template.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,7 @@
"orders.item.reopen"
],
"modulePermissions": [
"modperms.orders.item.put",
"orders-storage.titles.item.get",
"orders-storage.configuration.prefixes.collection.get",
"orders-storage.configuration.suffixes.collection.get",
"finance.funds.item.get",
"finance.transactions.collection.get",
"finance.transactions.batch"
"modperms.orders.item.put"
]
},
{
Expand Down Expand Up @@ -155,6 +149,9 @@
"permissionsRequired": [
"orders.po-lines.collection.get"
],
"permissionsDesired": [
"orders.bypass-acquisition-units"
],
"modulePermissions": [
"acquisitions-units-storage.units.collection.get",
"acquisitions-units-storage.memberships.collection.get",
Expand Down Expand Up @@ -195,6 +192,9 @@
"permissionsRequired": [
"orders.po-lines.item.get"
],
"permissionsDesired": [
"orders.bypass-acquisition-units"
],
"modulePermissions": [
"orders-storage.po-lines.item.get",
"orders-storage.alerts.item.get",
Expand All @@ -214,6 +214,9 @@
"permissionsRequired": [
"orders.po-lines.item.put"
],
"permissionsDesired": [
"orders.bypass-acquisition-units"
],
"modulePermissions": [
"orders-storage.alerts.item.post",
"orders-storage.alerts.item.put",
Expand Down Expand Up @@ -258,6 +261,7 @@
"organizations-storage.organizations.collection.get",
"invoice.invoice-lines.collection.get",
"invoice.invoice-lines.item.put",
"invoices.bypass-acquisition-units",
"orders-storage.order-invoice-relationships.collection.get",
"user-tenants.collection.get",
"consortia.sharing-instances.item.post"
Expand Down Expand Up @@ -311,7 +315,8 @@
"orders-storage.po-lines.item.put",
"orders-storage.pieces.collection.get",
"user-tenants.collection.get",
"consortia.sharing-instances.item.post"
"consortia.sharing-instances.item.post",
"configuration.entries.collection.get"
]
},
{
Expand Down Expand Up @@ -438,6 +443,10 @@
"modulePermissions": [
"orders-storage.pieces.collection.get",
"orders-storage.pieces.item.put",
"orders-storage.po-lines.collection.get",
"orders-storage.po-lines.item.put",
"orders-storage.purchase-orders.item.get",
"orders-storage.purchase-orders.item.put",
"orders-storage.titles.collection.get",
"acquisitions-units-storage.units.collection.get",
"acquisitions-units-storage.memberships.collection.get"
Expand Down Expand Up @@ -990,6 +999,61 @@
}
]
},
{
"id": "orders.routing-list",
"version": "1.0",
"handlers": [
{
"methods": ["GET"],
"pathPattern": "/orders/routing-lists",
"permissionsRequired": ["orders.routing-lists.collection.get"],
"modulePermissions": ["orders-storage.routing-lists.collection.get"]
},
{
"methods": ["POST"],
"pathPattern": "/orders/routing-lists",
"permissionsRequired": ["orders.routing-lists.item.post"],
"modulePermissions": [
"orders-storage.routing-lists.item.post",
"orders-storage.po-lines.item.get",
"orders-storage.routing-lists.collection.get"
]
},
{
"methods": ["GET"],
"pathPattern": "/orders/routing-lists/{id}",
"permissionsRequired": ["orders.routing-lists.item.get"],
"modulePermissions": ["orders-storage.routing-lists.item.get"]
},
{
"methods": ["PUT"],
"pathPattern": "/orders/routing-lists/{id}",
"permissionsRequired": ["orders.routing-lists.item.put"],
"modulePermissions": [
"orders-storage.routing-lists.item.put",
"orders-storage.po-lines.item.get",
"orders-storage.routing-lists.collection.get"
]
},
{
"methods": ["DELETE"],
"pathPattern": "/orders/routing-lists/{id}",
"permissionsRequired": ["orders.routing-lists.item.delete"],
"modulePermissions": ["orders-storage.routing-lists.item.delete"]
},
{
"methods": ["GET"],
"pathPattern": "/orders/routing-lists/{id}/template",
"permissionsRequired": ["orders.routing-list-template.item.get"],
"modulePermissions": [
"orders-storage.routing-lists.item.get",
"orders-storage.settings.collection.get",
"users.collection.get",
"template-request.post"
]
}
]
},
{
"id": "_jsonSchemas",
"version": "1.0",
Expand Down Expand Up @@ -1117,11 +1181,11 @@
},
{
"id": "finance.funds",
"version": "2.0"
"version": "3.0"
},
{
"id": "finance.transactions",
"version": "5.1"
"version": "6.0"
},
{
"id": "finance.fiscal-years",
Expand Down Expand Up @@ -1190,6 +1254,14 @@
{
"id": "user-tenants",
"version": "1.0"
},
{
"id": "users",
"version": "16.0"
},
{
"id": "template-engine",
"version": "2.2"
}
],
"optional": [
Expand Down Expand Up @@ -1446,6 +1518,11 @@
"acquisitions-units.units.item.delete"
]
},
{
"permissionName": "orders.bypass-acquisition-units",
"displayName": "Bypass acquisition units checks",
"description": "Backend internal permission to bypass order acquisition units checks"
},
{
"permissionName": "orders.acquisitions-units-assignments.assign",
"displayName": "Acquisitions unit assignment - create unit assignment",
Expand Down Expand Up @@ -1692,6 +1769,49 @@
"displayName" : "orders holding-summary get",
"description" : "Holding summary"
},
{
"permissionName" : "orders.routing-lists.collection.get",
"displayName" : "orders routing-list collection get",
"description" : "Orders routing-list collection get"
},
{
"permissionName" : "orders.routing-lists.item.post",
"displayName" : "orders routing-list item post",
"description" : "Orders routing-list item post"
},
{
"permissionName" : "orders.routing-lists.item.get",
"displayName" : "orders routing-list item get",
"description" : "Orders routing-list item get"
},
{
"permissionName" : "orders.routing-lists.item.put",
"displayName" : "orders routing-list item put",
"description" : "Orders routing-list item put"
},
{
"permissionName" : "orders.routing-lists.item.delete",
"displayName" : "orders routing-list item delete",
"description" : "Orders routing-list item delete"
},
{
"permissionName": "orders.routing-list-template.item.get",
"displayName" : "orders routing-list-template item get",
"description" : "Orders routing-list-template item get"
},
{
"permissionName" : "orders.routing-lists.all",
"displayName" : "All routing list perms",
"description" : "All permissions for the routing list",
"subPermissions" : [
"orders.routing-lists.collection.get",
"orders.routing-lists.item.post",
"orders.routing-lists.item.get",
"orders.routing-lists.item.put",
"orders.routing-lists.item.delete",
"orders.routing-list-template.item.get"
]
},
{
"permissionName": "orders.all",
"displayName": "orders - all permissions",
Expand Down Expand Up @@ -1726,8 +1846,8 @@
"orders.rollover.item.post",
"orders.holding-summary.collection.get",
"orders.acquisition-methods.all",
"orders.export-history.all"

"orders.export-history.all",
"orders.routing-lists.all"
]
},
{
Expand All @@ -1738,6 +1858,8 @@
"acquisitions-units-storage.units.collection.get",
"acquisitions-units-storage.memberships.collection.get",
"circulation.requests.collection.get",
"orders-storage.configuration.prefixes.collection.get",
"orders-storage.configuration.suffixes.collection.get",
"orders-storage.purchase-orders.collection.get",
"orders-storage.purchase-orders.item.put",
"orders-storage.purchase-orders.item.get",
Expand All @@ -1760,10 +1882,12 @@
"orders-storage.reporting-codes.item.put",
"orders-storage.reporting-codes.item.delete",
"orders-storage.titles.collection.get",
"orders-storage.titles.item.get",
"orders-storage.order-invoice-relationships.collection.get",
"configuration.entries.collection.get",
"finance.funds.budget.item.get",
"finance.funds.collection.get",
"finance.funds.item.get",
"finance.budgets.collection.get",
"finance.transactions.batch",
"finance.transactions.collection.get",
Expand Down Expand Up @@ -1797,6 +1921,7 @@
"inventory-storage.identifier-types.collection.get",
"invoice.invoices.collection.get",
"invoice.invoice-lines.collection.get",
"invoices.bypass-acquisition-units",
"organizations-storage.organizations.collection.get",
"organizations-storage.organizations.item.get",
"isbn-utils.convert-to-13.get"
Expand Down
9 changes: 5 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.folio</groupId>
<artifactId>mod-orders</artifactId>
<version>12.8.0-SNAPSHOT</version>
<version>12.9.0-SNAPSHOT</version>

<name>Orders Business Logic</name>
<description>Business logic to manage orders in FOLIO</description>
Expand Down Expand Up @@ -64,8 +64,8 @@

<!--Dependency Properties-->
<mod-configuration-client.version>5.10.0</mod-configuration-client.version>
<folio-di-support.version>2.0.1</folio-di-support.version>
<spring.version>6.0.2</spring.version>
<folio-di-support.version>2.1.0</folio-di-support.version>
<spring.version>6.1.5</spring.version>
<aspectj.version>1.9.21.1</aspectj.version>
<rest-assured.version>5.4.0</rest-assured.version>

Expand Down Expand Up @@ -244,7 +244,7 @@
<dependency>
<groupId>org.folio</groupId>
<artifactId>data-import-processing-core</artifactId>
<version>4.2.0-SNAPSHOT</version>
<version>4.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.github.rworsnop</groupId>
Expand Down Expand Up @@ -428,6 +428,7 @@
<version>${maven-compiler-plugin.version}</version>
<configuration>
<release>17</release>
<parameters>true</parameters>
</configuration>
<executions>
<execution>
Expand Down
2 changes: 1 addition & 1 deletion ramls/acq-models
Submodule acq-models updated 29 files
+0 −0 common/examples/setting_collection.sample
+0 −0 common/examples/setting_get.sample
+0 −0 common/examples/setting_post.sample
+1 −1 common/schemas/setting.json
+0 −0 common/schemas/setting_collection.json
+7 −3 mod-finance/examples/fund.sample
+7 −3 mod-finance/examples/fund_collection.sample
+7 −3 mod-finance/examples/fund_details.sample
+17 −4 mod-finance/schemas/fund.json
+17 −4 mod-finance/schemas/fund_details.json
+14 −2 mod-gobi/schemas/mapping.json
+3 −0 mod-orders-storage/examples/order_line_audit_event.sample
+2 −0 mod-orders-storage/examples/piece_audit_event.sample
+8 −0 mod-orders-storage/examples/piece_collection.sample
+3 −0 mod-orders-storage/examples/piece_get.sample
+2 −0 mod-orders-storage/examples/piece_post.sample
+8 −2 mod-orders-storage/examples/po_line_collection.sample
+8 −2 mod-orders-storage/examples/po_line_get.sample
+4 −2 mod-orders-storage/examples/po_line_post.sample
+16 −0 mod-orders-storage/examples/routing_list_collection.sample
+11 −0 mod-orders-storage/examples/routing_list_get.sample
+7 −3 mod-orders-storage/schemas/location.json
+14 −1 mod-orders-storage/schemas/piece.json
+8 −0 mod-orders-storage/schemas/po_line.json
+44 −0 mod-orders-storage/schemas/routing_list.json
+26 −0 mod-orders-storage/schemas/routing_list_collection.json
+8 −2 mod-orders/examples/composite_po_line.sample
+4 −0 mod-orders/examples/composite_purchase_order.sample
+8 −0 mod-orders/schemas/composite_po_line.json
Loading

0 comments on commit f421f78

Please sign in to comment.