diff options
| author | Lukasz Jarocki <lukasz.jarocki@sonarsource.com> | 2023-05-23 10:27:06 +0200 |
|---|---|---|
| committer | sonartech <sonartech@sonarsource.com> | 2023-06-01 20:02:59 +0000 |
| commit | 92c132a13f46f23a5ecc5dee5dfdfb619e6fa65f (patch) | |
| tree | af217205f33c28a90494945efaf680a587edd693 /server/sonar-db-dao | |
| parent | 36e9f01ad563aaeaae36dc6efc69e724f8c039c1 (diff) | |
| download | sonarqube-92c132a13f46f23a5ecc5dee5dfdfb619e6fa65f.tar.gz sonarqube-92c132a13f46f23a5ecc5dee5dfdfb619e6fa65f.zip | |
SONAR-18856 Refactor subportfolios and fix build and tests
Diffstat (limited to 'server/sonar-db-dao')
3 files changed, 16 insertions, 3 deletions
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/entity/EntityDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/entity/EntityDto.java index 11aa6ef3d37..03e0b564dc3 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/entity/EntityDto.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/entity/EntityDto.java @@ -32,6 +32,16 @@ public class EntityDto { protected String qualifier; protected boolean isPrivate; + // This field should be null for anything that is not subportfolio + protected String authUuid; + + public String getAuthUuid() { + if (qualifier.equals("SVW")) { + return authUuid; + } + return uuid; + } + public String getKey() { return kee; } diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/portfolio/PortfolioMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/portfolio/PortfolioMapper.xml index 0264a211032..d48462256c2 100644 --- a/server/sonar-db-dao/src/main/resources/org/sonar/db/portfolio/PortfolioMapper.xml +++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/portfolio/PortfolioMapper.xml @@ -14,7 +14,9 @@ p.selection_mode as selectionMode, p.selection_expression as selectionExpression, p.created_at as createdAt, - p.updated_at as updatedAt + p.updated_at as updatedAt, + case when p.parent_uuid is null then 'VW' else 'SVW' end as qualifier, + case when p.root_uuid != p.uuid then p.root_uuid else null end as authUuid </sql> <sql id="projectColumns"> diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/project/ProjectMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/project/ProjectMapper.xml index 11332464dcd..e623ae82be7 100644 --- a/server/sonar-db-dao/src/main/resources/org/sonar/db/project/ProjectMapper.xml +++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/project/ProjectMapper.xml @@ -203,12 +203,13 @@ </select> <sql id="entityProjectColumns"> - p.uuid as uuid, p.kee as kee, p.name as name, p.private as isPrivate, p.qualifier as qualifier + p.uuid as uuid, p.kee as kee, p.name as name, p.private as isPrivate, p.qualifier as qualifier, null as authUuid </sql> <sql id="entityPortfolioColumns"> p.uuid as uuid, p.kee as kee, p.name as name, p.private as isPrivate, - case when p.parent_uuid is null then 'VW' else 'SVW' end as qualifier + case when p.parent_uuid is null then 'VW' else 'SVW' end as qualifier, + case when p.root_uuid != p.uuid then p.root_uuid else null end as authUuid </sql> <select id="selectEntityByUuid" parameterType="string" resultType="Entity"> |