Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CIRC-2142: Merge ECS TLR feature branch into master #1510

Merged
merged 34 commits into from
Nov 8, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
19bf73c
[CIRC-2051] Add ecsRequestRouting parameter to allowed-service-points…
roman-barannyk Apr 15, 2024
e131373
Merge remote-tracking branch 'origin/ecs-tlr-feature' into ecs-tlr-fe…
roman-barannyk Apr 23, 2024
6e3315d
conflicts resolving
roman-barannyk Apr 23, 2024
ae6991d
conflicts resolving
roman-barannyk Apr 24, 2024
32b7e00
CIRC-2081: Fetch TLR settings from mod-settings (#1467)
OleksandrVidinieiev Apr 26, 2024
3167b20
CIRC-2072 Create a facade for instance search
MagzhanArtykov Apr 30, 2024
6676cde
CIRC-2072 Create a facade for instance search
MagzhanArtykov May 2, 2024
1c1cd46
CIRC-2072 Added API test
MagzhanArtykov May 13, 2024
6797c1b
CIRC-2072 Added API test
MagzhanArtykov May 15, 2024
eac3e54
CIRC-2072 Create a facade for instance search
MagzhanArtykov May 20, 2024
1b29087
CIRC-2072 Create a facade for instance search
MagzhanArtykov May 21, 2024
a6e440e
CIRC-2072 Create a facade for instance search
MagzhanArtykov May 23, 2024
1c88c01
CIRC-2072 Create a facade for instance search
MagzhanArtykov May 24, 2024
be46a67
CIRC-2072 Create a facade for instance search
MagzhanArtykov May 24, 2024
9d68320
CIRC-2072 Create a facade for instance search
MagzhanArtykov May 27, 2024
af5a9f7
CIRC-2072 Create a facade for instance search
MagzhanArtykov May 27, 2024
f86281c
CIRC-2072 Create a facade for instance search
MagzhanArtykov May 27, 2024
0702200
CIRC-2072 Create a facade for instance search
MagzhanArtykov May 27, 2024
0b2acfd
CIRC-2072 Create a facade for instance search
MagzhanArtykov May 28, 2024
123dca6
Merge pull request #1471 from folio-org/CIRC-2072b
MagzhanArtykov May 29, 2024
ba47983
Merge branch 'master' into ecs-tlr-feature
OleksandrVidinieiev May 30, 2024
3f6bd4f
CIRC-2101: Fetch item details across tenants (#1474)
OleksandrVidinieiev Jun 6, 2024
5cff758
Merge branch 'master' into ecs-tlr-feature
alexanderkurash Jun 21, 2024
ea17564
CIRC-2109 Pass additional includeRoutingServicePoints parameter when …
alexanderkurash Jul 3, 2024
5bd43b6
CIRC-2117 Return empty result when search doesn't find anything (#1485)
Maksat-Galymzhan Jul 19, 2024
1bb48aa
[CIRC-2116] Allowed SP endpoint should support patronGroupId paramete…
MagzhanArtykov Jul 22, 2024
e9f3399
CIRC-2125: Search title-level requests by both `itemId` and `instance…
OleksandrVidinieiev Aug 9, 2024
c53bbcd
CIRC-2137 Allow operation `replace` for instance with no items (#1489)
OleksandrVidinieiev Aug 29, 2024
0907443
CIRC-2151 Change ECS Primary request validation (#1496)
alexanderkurash Sep 27, 2024
afcd021
Merge branch 'master' into ecs-tlr-feature
alexanderkurash Oct 18, 2024
50a3e6f
Fix tests after merging with master branch
alexanderkurash Oct 18, 2024
7115a63
Merge branch 'master' of https://github.com/folio-org/mod-circulation…
MagzhanArtykov Oct 24, 2024
52f1120
Merge remote-tracking branch 'origin/master' into ecs-tlr-feature
OleksandrVidinieiev Nov 7, 2024
1797308
CIRC-2153 Post-merge fixes
OleksandrVidinieiev Nov 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into ecs-tlr-feature
# Conflicts:
#	descriptors/ModuleDescriptor-template.json
#	src/main/java/org/folio/circulation/support/Clients.java
#	src/test/java/api/support/http/InterfaceUrls.java
#	src/test/java/api/support/http/ResourceClient.java
  • Loading branch information
alexanderkurash committed Jun 21, 2024
commit 5cff7581c2d12eb27c05ec496b8373365421bc71
25 changes: 25 additions & 0 deletions descriptors/ModuleDescriptor-template.json
Original file line number Diff line number Diff line change
Expand Up @@ -1600,6 +1600,31 @@
"displayName": "circulation - get items by instance",
"description": "get items by instance"
},
{
"permissionName": "circulation.settings.collection.get",
"displayName": "circulation - get circulation settings",
"description": "get a collection of circulation settings"
},
{
"permissionName": "circulation.settings.item.get",
"displayName": "circulation - get an individual circulation setting",
"description": "get an individual circulation setting by ID"
},
{
"permissionName": "circulation.settings.item.put",
"displayName": "circulation - update circulation setting",
"description": "update circulation setting by ID"
},
{
"permissionName": "circulation.settings.item.post",
"displayName": "circulation - create circulation setting",
"description": "create a new circulation setting"
},
{
"permissionName": "circulation.settings.item.delete",
"displayName": "circulation - delete circulation setting",
"description": "delete circulation setting by ID"
},
{
"permissionName": "circulation.all",
"displayName": "circulation - all permissions",
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/org/folio/circulation/support/Clients.java
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ private Clients(OkapiHttpClient client, WebContext context) {
settingsStorageClient = createSettingsStorageClient(client, context);
circulationItemClient = createCirculationItemClient(client, context);
searchClient = createSearchClient(client, context);
circulationSettingsStorageClient = createCirculationSettingsStorageClient(client, context);
}
catch(MalformedURLException e) {
throw new InvalidOkapiLocationException(context.getOkapiLocation(), e);
Expand Down Expand Up @@ -385,6 +386,10 @@ public CollectionResourceClient searchClient() {
return searchClient;
}

public CollectionResourceClient circulationSettingsStorageClient() {
return circulationSettingsStorageClient;
}

private static CollectionResourceClient getCollectionResourceClient(
OkapiHttpClient client, WebContext context,
String path)
Expand Down Expand Up @@ -818,6 +823,13 @@ private CollectionResourceClient createSearchClient(
return getCollectionResourceClient(client, context, "/search/instances");
}

private CollectionResourceClient createCirculationSettingsStorageClient(
OkapiHttpClient client, WebContext context) throws MalformedURLException {

return getCollectionResourceClient(client, context,
"/circulation-settings-storage/circulation-settings");
}

private GetManyRecordsClient createSettingsStorageClient(
OkapiHttpClient client, WebContext context)
throws MalformedURLException {
Expand Down
3 changes: 3 additions & 0 deletions src/test/java/api/support/http/InterfaceUrls.java
Original file line number Diff line number Diff line change
Expand Up @@ -341,4 +341,7 @@ public static URL searchUrl(String subPath) {
public static URL itemsByInstanceUrl(String subPath) {
return circulationModuleUrl("/circulation/items-by-instance?" + subPath);
}
public static URL circulationSettingsUrl(String subPath) {
return circulationModuleUrl("/circulation/settings" + subPath);
}
}
4 changes: 4 additions & 0 deletions src/test/java/api/support/http/ResourceClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,10 @@ public static ResourceClient forSearchClient() {
return new ResourceClient(InterfaceUrls::searchUrl, "instances");
}

public static ResourceClient forCirculationSettings() {
return new ResourceClient(InterfaceUrls::circulationSettingsUrl, "circulationSettings");
}

private ResourceClient(UrlMaker urlMaker, String collectionArrayPropertyName) {
this.urlMaker = urlMaker;
this.collectionArrayPropertyName = collectionArrayPropertyName;
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.