Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into bugfix-release-1.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@OleksandrVidinieiev
OleksandrVidinieiev committed Dec 30, 2024
2 parents fc478f4 + a120e80 commit 462fc8c
Show file tree
Hide file tree
Showing 235 changed files with 14,022 additions and 1,565 deletions.
48 changes: 48 additions & 0 deletions NEWS.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,51 @@
## 1.0.2 2024-12-12
* Copy Secure Patron name when cloning users (MODTLR-116)
* Support for intermediate requests (MODTLR-98)
* Search Slips API (MODTLR-75)

## 1.0.1 2024-11-30
* Merge `ecs-tlr-feature` branch into `master` (MODTLR-69)
* Create pickup service point in lending tenant (MODTLR-17)
* Remove unneeded fields from the requester copy, update group (MODTLR-27)
* Fix creation of DCB transactions (MODTLR-30)
* Add `ecsRequestPhase` to primary and secondary requests (MODTLR-31)
* Add missing dependencies (MODTLR-33)
* Create allowed-service-points endpoint (MODTLR-25)
* Upgrade to Spring Boot 3.3.0 (MODTLR-37)
* Create borrowing transaction (MODTLR-47)
* Allowed service points - data tenant interaction (MODTLR-26)
* Add allow-service-points permission (MODTLR-49)
* Consume and handle patron group domain events (MODTLR-48)
* Update DCB transaction upon request update event (MODTLR-34)
* Create borrowing transaction in mod-dcb (MODTLR-47)
* Call Publications API when ECS TLR setting updated (MODTLR-44)
* Use `patronGroupId` parameter instead of `requesterId` (MODTLR-50)
* Propagate changes from primary to secondary request (MODTLR-41)
* Close ECS TLR when both Primary and Secondary requests are cancelled (MODTLR-40)
* Switch additionalProperties to true to defined schemas (MODTLR-52)
* Create DCB transactions immediately when ECS TLR is created (MODTLR-51)
* Reorder secondary requests - part 1 (MODTLR-42)
* Reorder secondary requests - part 2 (MODTLR-43)
* Use `requesterId` instead of `patronGroupId` in Allowed Service Points API (MODTLR-54)
* Autogenerate ECS TLR ID when client doesn't provide it (MODTLR-53)
* Support for operation `replace` in Allowed Service Points API (MODTLR-56)
* Add system user variables, bump folio-spring-system-user version (MODTLR-57)
* Get token from headers as a fallback (MODTLR-67)
* Allowed service points API for item-level requests (MODTLR-59)
* Fix remaining ECS TLR scenarios and create tests (MODTLR-73)
* Pick Slips API - part 1 (MODTLR-58)
* Pick Slips API - part 2 (MODTLR-79)
* Handle null circulation item correctly (MODTLR-84)
* Allowed service points - only use lending side circulation rules (MODTLR-68)
* Incorporate support for Locate ECS requests (MODTLR-82)
* Fix permissions for mod-patron (MODTLR-93)
* Rename mod-settings permissions (MODTLR-97)
* Consume and handle user UPDATE events (MODTLR-64)
* Revert mod-settings permissions (MODTLR-99)
* Add system user to module descriptor (MODTLR-100)
* Remove okapi token parsing (MODTLR-104)
* Allowed service points - accept `patronGroupId` parameter (MODTLR-102)

## 1.0.0 2024-10-30
* Update folio-spring-support version (MODTLR-71)
* Upgrade packages in Dockerfile (MODTLR-36)
Expand Down
18 changes: 18 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,24 @@ Version 2.0. See the file "[LICENSE](LICENSE)" for more information.

FOLIO compatible title level requests functionality.

### Environment variables

| Name | Default value | Description |
|:----------------------|:--------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| JAVA_OPTIONS | -XX:MaxRAMPercentage=66.0 | Java options |
| DB_HOST | postgres | Postgres hostname |
| DB_PORT | 5432 | Postgres port |
| DB_USERNAME | postgres | Postgres username |
| DB_PASSWORD | postgres | Postgres username password |
| DB_DATABASE | okapi_modules | Postgres database name |
| KAFKA_HOST | kafka | Kafka broker hostname |
| KAFKA_PORT | 9092 | Kafka broker port |
| SYSTEM_USER_USERNAME | mod-tlr | Username for `mod-tlr` system user |
| SYSTEM_USER_PASSWORD | - | Password for `mod-tlr` system user (not required for dev envs) |
| SYSTEM_USER_ENABLED | true | Defines if system user must be created at service tenant initialization |
| OKAPI_URL | - | OKAPI URL used to login system user, required |
| ENV | folio | The logical name of the deployment, must be unique across all environments using the same shared Kafka/Elasticsearch clusters, `a-z (any case)`, `0-9`, `-`, `_` symbols only allowed |

## Further information

### Issue tracker
Expand Down
214 changes: 208 additions & 6 deletions descriptors/ModuleDescriptor-template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,18 @@
"modulePermissions": [
"circulation.requests.instances.item.post",
"circulation.requests.item.post",
"circulation-item.item.get",
"circulation-item.collection.get",
"circulation-item.item.post",
"circulation-item.item.put",
"search.instances.collection.get",
"users.item.get",
"users.collection.get",
"users.item.post"
"users.item.post",
"inventory-storage.service-points.item.get",
"inventory-storage.service-points.collection.get",
"inventory-storage.service-points.item.post",
"user-tenants.collection.get"
]
},
{
Expand All @@ -39,6 +47,55 @@
}
]
},
{
"id": "ecs-request-external",
"version": "1.0",
"handlers": [
{
"methods": ["POST"],
"pathPattern": "/tlr/create-ecs-request-external",
"permissionsRequired": ["tlr.ecs-request-external.post"],
"modulePermissions": [
"circulation.requests.instances.item.post",
"circulation.requests.item.post",
"circulation-item.item.get",
"circulation-item.collection.get",
"circulation-item.item.post",
"circulation-item.item.put",
"search.instances.collection.get",
"users.item.get",
"users.collection.get",
"users.item.post",
"inventory-storage.service-points.item.get",
"inventory-storage.service-points.collection.get",
"inventory-storage.service-points.item.post"
]
}
]
},
{
"id": "ecs-tlr-allowed-service-points",
"version": "1.0",
"handlers": [
{
"methods": ["GET"],
"pathPattern": "/tlr/allowed-service-points",
"permissionsRequired": [
"tlr.ecs-tlr-allowed-service-points.get"
],
"modulePermissions": [
"circulation.requests.allowed-service-points.get",
"users.item.get",
"users.collection.get",
"search.instances.collection.get",
"circulation-storage.requests.item.get",
"circulation-storage.requests.collection.get",
"consortium-search.items.item.get",
"consortium-search.items.collection.get"
]
}
]
},
{
"id": "tlr-settings",
"version": "1.0",
Expand All @@ -57,6 +114,56 @@
}
]
},
{
"id": "tlr-staff-slips",
"version": "1.0",
"handlers": [
{
"methods": ["GET"],
"pathPattern": "/tlr/staff-slips/pick-slips/{servicePointId}",
"permissionsRequired": ["tlr.pick-slips.collection.get"],
"modulePermissions": [
"user-tenants.collection.get",
"circulation-storage.requests.item.get",
"circulation-storage.requests.collection.get",
"users.item.get",
"users.collection.get",
"usergroups.item.get",
"usergroups.collection.get",
"departments.item.get",
"departments.collection.get",
"addresstypes.item.get",
"addresstypes.collection.get",
"inventory-storage.service-points.item.get",
"inventory-storage.service-points.collection.get",
"inventory-storage.instances.item.get",
"inventory-storage.instances.collection.get"
]
},
{
"methods": ["GET"],
"pathPattern": "/tlr/staff-slips/search-slips/{servicePointId}",
"permissionsRequired": ["tlr.search-slips.collection.get"],
"modulePermissions": [
"user-tenants.collection.get",
"circulation-storage.requests.item.get",
"circulation-storage.requests.collection.get",
"users.item.get",
"users.collection.get",
"usergroups.item.get",
"usergroups.collection.get",
"departments.item.get",
"departments.collection.get",
"addresstypes.item.get",
"addresstypes.collection.get",
"inventory-storage.service-points.item.get",
"inventory-storage.service-points.collection.get",
"inventory-storage.instances.item.get",
"inventory-storage.instances.collection.get"
]
}
]
},
{
"id": "_tenant",
"version": "2.0",
Expand Down Expand Up @@ -151,22 +258,120 @@
"mod-settings.entries.item.post"
],
"visible": true
},
{
"permissionName": "tlr.ecs-tlr-allowed-service-points.get",
"displayName": "ecs-tlr - allowed service points",
"description": "Get ECS TLR allowed service points"
},
{
"permissionName": "tlr.pick-slips.collection.get",
"displayName": "ecs-tlr - pick slips",
"description": "Get pick slips"
}, {
"permissionName": "tlr.search-slips.collection.get",
"displayName": "ecs-tlr - search slips",
"description": "Get search slips"
},
{
"permissionName": "tlr.ecs-request-external.post",
"displayName": "ecs-request-external - create ECS request external",
"description": "Create ECS request external"
}
],
"requires": [
{
"id": "users",
"version": "16.0"
"version": "16.3"
},
{
"id": "login",
"version": "7.3"
},
{
"id": "permissions",
"version": "5.6"
"version": "5.7"
},
{
"id": "circulation",
"version": "14.4"
},
{
"id": "transactions",
"version": "1.0"
},
{
"id": "search",
"version": "1.3"
},
{
"id": "allowed-service-points",
"version": "1.0"
}
],
"optional": [
{
"id": "ecs-request-transactions",
"version": "1.0"
}
],
"metadata": {
"user": {
"type": "system",
"permissions": [
"users.collection.get",
"users.item.get",
"users.item.post",
"users.item.put",
"user-tenants.collection.get",
"usergroups.item.post",
"usergroups.item.put",
"search.instances.collection.get",
"circulation.requests.instances.item.post",
"circulation.requests.item.post",
"circulation.requests.queue-item.collection.get",
"circulation.requests.queue-instance.collection.get",
"circulation.requests.queue.item-reorder.collection.post",
"circulation.requests.queue.instance-reorder.collection.post",
"circulation-storage.requests.item.get",
"circulation-storage.requests.collection.get",
"circulation-storage.requests.item.put",
"inventory-storage.service-points.item.get",
"inventory-storage.service-points.collection.get",
"inventory-storage.service-points.item.post",
"dcb.ecs-request.transactions.post",
"circulation.requests.allowed-service-points.get",
"dcb.transactions.get",
"dcb.transactions.put",
"inventory-storage.items.item.get",
"inventory-storage.items.collection.get",
"inventory-storage.instances.item.get",
"inventory-storage.instances.collection.get",
"circulation-item.item.post",
"circulation-item.item.put",
"circulation-item.item.get",
"circulation-item.collection.get",
"inventory-storage.holdings.item.get",
"inventory-storage.holdings.collection.get",
"inventory-storage.material-types.item.get",
"inventory-storage.material-types.collection.get",
"inventory-storage.loan-types.item.get",
"inventory-storage.loan-types.collection.get",
"inventory-storage.locations.item.get",
"inventory-storage.locations.collection.get",
"inventory-storage.location-units.libraries.item.get",
"inventory-storage.location-units.libraries.collection.get",
"inventory-storage.location-units.campuses.item.get",
"inventory-storage.location-units.campuses.collection.get",
"inventory-storage.location-units.institutions.item.get",
"inventory-storage.location-units.institutions.collection.get",
"circulation.rules.request-policy.get",
"mod-settings.entries.item.get",
"mod-settings.entries.collection.get",
"mod-settings.global.read.circulation"
]
}
},
"launchDescriptor": {
"dockerImage": "@artifactId@:@version@",
"dockerPull": false,
Expand Down Expand Up @@ -198,9 +403,6 @@
{ "name": "DB_USERNAME", "value": "folio_admin" },
{ "name": "DB_PASSWORD", "value": "folio_admin" },
{ "name": "DB_DATABASE", "value": "okapi_modules" },
{ "name": "DB_QUERYTIMEOUT", "value": "60000" },
{ "name": "DB_CHARSET", "value": "UTF-8" },
{ "name": "DB_MAXPOOLSIZE", "value": "5" },
{ "name": "SYSTEM_USER_USERNAME", "value": "mod-tlr" },
{ "name": "SYSTEM_USER_PASSWORD", "value": "mod-tlr" },
{ "name": "SYSTEM_USER_ENABLED", "value": "true" }
Expand Down
Loading

0 comments on commit 462fc8c

Please sign in to comment.