From 3f97eb37e56df2567bdf44d220e57746fa60af27 Mon Sep 17 00:00:00 2001 From: Nick <53413353+nickpalladino@users.noreply.github.com> Date: Wed, 6 Aug 2025 11:50:59 -0400 Subject: [PATCH 1/4] Checkout correct branch --- .github/workflows/docker-build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index c5aaddcf..e8d35577 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -26,7 +26,6 @@ jobs: - name: Checkout develop branch uses: actions/checkout@v4 with: - ref: develop # Default to develop, will be overridden by push events to other branches fetch-depth: 0 # Fetch all history to ensure common ancestor is found - name: Conditionally Fetch and Merge Upstream PR @@ -149,4 +148,4 @@ jobs: for tag in "${TAG_ARRAY[@]}"; do FORMATTED_TAGS="$FORMATTED_TAGS --tag $tag" done - docker buildx build . --file Dockerfile $FORMATTED_TAGS --push --platform=linux/arm64,linux/amd64 \ No newline at end of file + docker buildx build . --file Dockerfile $FORMATTED_TAGS --push --platform=linux/arm64,linux/amd64 From 3e68ae5ef18024c64289717a48d90d259e5314b7 Mon Sep 17 00:00:00 2001 From: Nick <53413353+nickpalladino@users.noreply.github.com> Date: Wed, 6 Aug 2025 11:52:50 -0400 Subject: [PATCH 2/4] Rename step to be more accurate --- .github/workflows/docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index e8d35577..286bde7d 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout develop branch + - name: Checkout branch uses: actions/checkout@v4 with: fetch-depth: 0 # Fetch all history to ensure common ancestor is found From 6bdae2a888c665a0311e6546a45afd1918f6b03c Mon Sep 17 00:00:00 2001 From: jloux-brapi Date: Wed, 6 Aug 2025 16:55:34 -0400 Subject: [PATCH 3/4] Add DISTINCT to select id only query --- .../brapi/test/BrAPITestServer/service/SearchQueryBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/brapi/test/BrAPITestServer/service/SearchQueryBuilder.java b/src/main/java/org/brapi/test/BrAPITestServer/service/SearchQueryBuilder.java index 314af1e1..80bf5bc5 100644 --- a/src/main/java/org/brapi/test/BrAPITestServer/service/SearchQueryBuilder.java +++ b/src/main/java/org/brapi/test/BrAPITestServer/service/SearchQueryBuilder.java @@ -21,7 +21,7 @@ public class SearchQueryBuilder { public SearchQueryBuilder(Class clazz) { this.selectClause = "SELECT distinct entity FROM " + clazz.getSimpleName() + " entity "; - this.selectOnlyIds = "SELECT entity.id FROM " + clazz.getSimpleName() + " entity "; + this.selectOnlyIds = "SELECT distinct entity.id FROM " + clazz.getSimpleName() + " entity "; this.whereClause = "WHERE 1=1 "; this.defaultSort = " ORDER BY entity.id ASC "; this.sortClause = ""; From 5029941d610c014f7ba43c1d734988b5a7826340 Mon Sep 17 00:00:00 2001 From: mlm483 <128052931+mlm483@users.noreply.github.com> Date: Mon, 18 Aug 2025 15:00:13 -0400 Subject: [PATCH 4/4] [BI-2688] - renamed migration --- .../{V004.001__add_indexes.sql => V003.001__add_indexes.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/db/migration/{V004.001__add_indexes.sql => V003.001__add_indexes.sql} (100%) diff --git a/src/main/resources/db/migration/V004.001__add_indexes.sql b/src/main/resources/db/migration/V003.001__add_indexes.sql similarity index 100% rename from src/main/resources/db/migration/V004.001__add_indexes.sql rename to src/main/resources/db/migration/V003.001__add_indexes.sql