Skip to content

Fix invoice payment request #84

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.

Sign up for GitHub

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

Open
luistarkbank wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix invoice payment request #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba41d65
Fix invoice payment request
luistarkbank Aug 3, 2023
286b71a
Fix Invoice payment request
luistarkbank Aug 3, 2023
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ Given a version number MAJOR.MINOR.PATCH, increment:

## [Unreleased]

### Fix
- Invoice.payment request

## [2.14.0] - 2023-05-03
### Added
- rules attribute to Invoice resource
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/starkbank/utils/Rest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,15 +133,15 @@ public static InputStream getContent(Resource.ClassData resource, String id, Str
}

public static <T extends SubResource> T getSubResource(Resource.ClassData resource, String id, SubResource.ClassData subResource, User user, Map<String, Object> options) throws Exception {
String content = Response.fetch(Api.endpoint(resource, id) + "/" + Api.endpoint(subResource), "GET", null, options, user).content();
String content = Response.fetch(Api.endpoint(resource, id) + Api.endpoint(subResource), "GET", null, options, user).content();
JsonObject contentJson = new Gson().fromJson(content, JsonObject.class);
JsonObject jsonObject = contentJson.get(Api.getLastName(subResource)).getAsJsonObject();
Gson gson = GsonEvent.getInstance();
return gson.fromJson(jsonObject, (Type) subResource.cls);
}

public static <T extends SubResource> List<T> getSubResources(Resource.ClassData resource, String id, SubResource.ClassData subResource, User user, Map<String, Object> options) throws Exception {
String content = Response.fetch(Api.endpoint(resource, id) + "/" + Api.endpoint(subResource), "GET", null, options, user).content();
String content = Response.fetch(Api.endpoint(resource, id) + Api.endpoint(subResource), "GET", null, options, user).content();
JsonObject contentJson = new Gson().fromJson(content, JsonObject.class);
JsonArray jsonArray = contentJson.get(Api.getLastNamePlural(subResource)).getAsJsonArray();
List<T> entities = new ArrayList<>();
Expand Down