Skip to content
This repository has been archived by the owner on Jul 29, 2021. It is now read-only.

Commit

Permalink
fix: Duplicated APIs are returned by the search in some cases
Browse files Browse the repository at this point in the history
  • Loading branch information
aelamrani authored and brasseld committed Apr 21, 2020
1 parent 19e288e commit 019e81f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Expand Up @@ -41,8 +41,8 @@
<mysql-connector-java.version>8.0.15</mysql-connector-java.version>
<postgresql.version>42.2.5</postgresql.version>
<mariaDB.version>2.3.0</mariaDB.version>
<wix-embedded-mysql.version>4.1.2</wix-embedded-mysql.version>
<postgresql-embedded.version>2.9</postgresql-embedded.version>
<wix-embedded-mysql.version>4.6.1</wix-embedded-mysql.version>
<postgresql-embedded.version>2.10</postgresql-embedded.version>
<testcontainers.version>1.11.1</testcontainers.version>
<default-database.jdbcType>postgresql-te</default-database.jdbcType>
</properties>
Expand Down
Expand Up @@ -218,7 +218,7 @@ private List<Api> findByCriteria(ApiCriteria apiCriteria, ApiFieldExclusionFilte
new JdbcHelper.CollatingRowMapper<>(ORM.getRowMapper(), CHILD_ADDER, "id");

String projection ="av.*, a.id, a.name, a.description, a.version, a.deployed_at, a.created_at, a.updated_at, " +
"a.visibility, a.lifecycle_state, a.picture";
"a.visibility, a.lifecycle_state";

if (apiFieldExclusionFilter == null || !apiFieldExclusionFilter.isDefinition()) {
projection += ", a.definition";
Expand All @@ -227,7 +227,8 @@ private List<Api> findByCriteria(ApiCriteria apiCriteria, ApiFieldExclusionFilte
projection += ", a.picture";
}

final StringBuilder sbQuery = new StringBuilder("select ").append(projection).append(" from apis a ");
// distinct is necessary because of the left join
final StringBuilder sbQuery = new StringBuilder("select distinct ").append(projection).append(" from apis a ");
sbQuery.append("left join api_views av on a.id = av.api_id ");

if (apiCriteria != null) {
Expand Down Expand Up @@ -304,4 +305,4 @@ private List<Api> findByCriteria(ApiCriteria apiCriteria, ApiFieldExclusionFilte
}
return apis;
}
}
}

0 comments on commit 019e81f

Please sign in to comment.