hostsharing/hs.hsadmin.ng
7
0
Fork 0
Code Pull Requests 1 Activity

fix HsHostingAssetRepository.findAllByCriteriaImpl query #69

Merged
hsh-michaelhoennig merged 1 commits from fix-find-hosting-assets-query into master 2024-07-03 10:36:30 +02:00
Conversation 0 Commits 1 Files Changed 4 +28 -32
hsh-michaelhoennig commented 2024-07-02 13:06:34 +02:00
Member
Copy Link
No description provided.
hsh-michaelhoennig added 1 commit 2024-07-02 13:06:34 +02:00
hsh-michaelhoennig reviewed 2024-07-02 13:08:43 +02:00
src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetRepository.java Outdated
@ -16,4 +16,1 @@
@Query("""
SELECT asset FROM HsHostingAssetEntity asset
WHERE (:projectUuid IS NULL OR asset.bookingItem.project.uuid = :projectUuid)
hsh-michaelhoennig commented 2024-07-02 13:08:43 +02:00
Author
Member
Copy Link

This JPQL query did only work for hosting-assets which have a directly-assigned booking-item because "left" was missing for the joins.

When I tried to run a test with EMAIL_ALIAS, it returned no records at all.

This JPQL query did only work for hosting-assets which have a directly-assigned booking-item because "left" was missing for the joins. When I tried to run a test with EMAIL_ALIAS, it returned no records at all.
hsh-michaelhoennig reviewed 2024-07-02 13:09:32 +02:00
src/main/resources/api-definition/hs-hosting/hs-hosting-assets.yaml Outdated
@ -7,13 +7,13 @@ get:
parameters:
- $ref: 'auth.yaml#/components/parameters/currentUser'
- $ref: 'auth.yaml#/components/parameters/assumedRoles'
- name: debitorUuid
hsh-michaelhoennig commented 2024-07-02 13:09:32 +02:00
Author
Member
Copy Link

This was a remnant from times before we had a project between debitor and asset. project makes more sense and the actual query was only implemented for project anyway.

This was a remnant from times before we had a project between debitor and asset. project makes more sense and the actual query was only implemented for project anyway.
hsh-michaelhoennig reviewed 2024-07-02 13:11:43 +02:00
src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetControllerAcceptanceTest.java Outdated
@ -89,22 +89,10 @@ class HsHostingAssetControllerAcceptanceTest extends ContextBasedTestWithCleanup
.contentType("application/json")
.body("", lenientlyEquals("""
[
{
hsh-michaelhoennig commented 2024-07-02 13:11:43 +02:00
Author
Member
Copy Link

because of the mismatch of debitor+project, ?projectUuid=" + givenProject.getUuid() was ignored and too many rows were returned, now, where this is fixed, only the rows for "D-1000111 default project" get returned

because of the mismatch of debitor+project, `?projectUuid=" + givenProject.getUuid() ` was ignored and too many rows were returned, now, where this is fixed, only the rows for "D-1000111 default project" get returned
hsh-michaelhoennig reviewed 2024-07-02 13:12:39 +02:00
src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetRepositoryIntegrationTest.java Outdated
@ -206,3 +207,4 @@
.findAny().orElseThrow().getUuid();
// when
context("superuser-alex@hostsharing.net", "hs_hosting_asset#vm1012:AGENT");
hsh-michaelhoennig commented 2024-07-02 13:12:39 +02:00
Author
Member
Copy Link

the test name says "normalUser ..." but the superuser context without assumed role was still open, now assuming a normal users role

the test name says "normalUser ..." but the superuser context without assumed role was still open, now assuming a normal users role
hsh-michaelhoennig force-pushed fix-find-hosting-assets-query from 3021048c87 to 278467efac 2024-07-02 13:18:57 +02:00 Compare
hsh-michaelhoennig reviewed 2024-07-02 13:19:33 +02:00
src/test/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetRepositoryIntegrationTest.java
@ -412,4 +413,2 @@
.containsExactlyInAnyOrder(serverNames);
}
void allTheseServersAreReturned(final List<HsHostingAssetEntity> actualResult, final String... serverNames) {
hsh-michaelhoennig commented 2024-07-02 13:19:33 +02:00
Author
Member
Copy Link

it's always better to test for exact returns then just for "contains", amended all calls, thus this methods is not needed anymore

it's always better to test for exact returns then just for "contains", amended all calls, thus this methods is not needed anymore
hsh-marcsandlus approved these changes 2024-07-03 10:36:02 +02:00
hsh-michaelhoennig merged commit c5722e494f into master 2024-07-03 10:36:30 +02:00
hsh-michaelhoennig deleted branch fix-find-hosting-assets-query 2024-07-03 10:36:30 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
hsh-marcsandlus
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: hostsharing/hs.hsadmin.ng#69
No description provided.
Delete Branch "fix-find-hosting-assets-query"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?