Browse Source

SONAR-21259 Add Dao methods for issues_fixed table

tags/10.4.0.87286
Léo Geoffroy 5 months ago
parent
commit
d6fd3827d2

+ 1
- 0
server/sonar-db-core/src/main/java/org/sonar/db/version/SqTables.java View File

@@ -60,6 +60,7 @@ public final class SqTables {
"internal_component_props",
"internal_properties",
"issues",
"issues_fixed",
"issues_impacts",
"issue_changes",
"live_measures",

+ 66
- 0
server/sonar-db-dao/src/it/java/org/sonar/db/issue/IssueFixedDaoIT.java View File

@@ -0,0 +1,66 @@
/*
* SonarQube
* Copyright (C) 2009-2023 SonarSource SA
* mailto:info AT sonarsource DOT com
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package org.sonar.db.issue;

import org.junit.Rule;
import org.junit.Test;
import org.sonar.api.utils.System2;
import org.sonar.db.DbSession;
import org.sonar.db.DbTester;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

public class IssueFixedDaoIT {
@Rule
public DbTester db = DbTester.create(System2.INSTANCE);

private final IssueFixedDao underTest = db.getDbClient().issueFixedDao();

@Test
public void insert_shouldPersistFixedIssue() {
IssueFixedDto fixedIssue = new IssueFixedDto("PR-1", "ISSUE-1");
underTest.insert(db.getSession(), fixedIssue);
assertThat(underTest.selectByPullRequest(db.getSession(), "PR-1")).containsOnly(fixedIssue);
}

@Test
public void insert_shouldThrowException_whenDuplicateRecord() {
IssueFixedDto fixedIssue = new IssueFixedDto("PR-1", "ISSUE-1");
DbSession session = db.getSession();
underTest.insert(session, fixedIssue);

assertThatThrownBy(() -> underTest.insert(session, fixedIssue))
.isInstanceOf(RuntimeException.class);
}

@Test
public void selectByPullRequest_shouldReturnAllFixedIssuesOfPullRequest() {
IssueFixedDto fixedIssue1 = new IssueFixedDto("PR-1", "ISSUE-1");
IssueFixedDto fixedIssue2 = new IssueFixedDto("PR-1", "ISSUE-2");
IssueFixedDto fixedIssue3 = new IssueFixedDto("PR-2", "ISSUE-3");
underTest.insert(db.getSession(), fixedIssue1);
underTest.insert(db.getSession(), fixedIssue2);
underTest.insert(db.getSession(), fixedIssue3);

assertThat(underTest.selectByPullRequest(db.getSession(), "PR-1")).containsOnly(fixedIssue1, fixedIssue2);
}

}

+ 2
- 0
server/sonar-db-dao/src/main/java/org/sonar/db/DaoModule.java View File

@@ -46,6 +46,7 @@ import org.sonar.db.event.EventDao;
import org.sonar.db.issue.AnticipatedTransitionDao;
import org.sonar.db.issue.IssueChangeDao;
import org.sonar.db.issue.IssueDao;
import org.sonar.db.issue.IssueFixedDao;
import org.sonar.db.measure.LiveMeasureDao;
import org.sonar.db.measure.MeasureDao;
import org.sonar.db.metric.MetricDao;
@@ -144,6 +145,7 @@ public class DaoModule extends Module {
InternalPropertiesDao.class,
IssueChangeDao.class,
IssueDao.class,
IssueFixedDao.class,
LiveMeasureDao.class,
MeasureDao.class,
MetricDao.class,

+ 7
- 0
server/sonar-db-dao/src/main/java/org/sonar/db/DbClient.java View File

@@ -46,6 +46,7 @@ import org.sonar.db.event.EventDao;
import org.sonar.db.issue.AnticipatedTransitionDao;
import org.sonar.db.issue.IssueChangeDao;
import org.sonar.db.issue.IssueDao;
import org.sonar.db.issue.IssueFixedDao;
import org.sonar.db.measure.LiveMeasureDao;
import org.sonar.db.measure.MeasureDao;
import org.sonar.db.metric.MetricDao;
@@ -193,6 +194,7 @@ public class DbClient {
private final GithubPermissionsMappingDao githubPermissionsMappingDao;
private final RuleChangeDao ruleChangeDao;
private final ProjectExportDao projectExportDao;
private final IssueFixedDao issueFixedDao;

public DbClient(Database database, MyBatis myBatis, DBSessions dbSessions, Dao... daos) {
this.database = database;
@@ -285,6 +287,7 @@ public class DbClient {
anticipatedTransitionDao = getDao(map, AnticipatedTransitionDao.class);
ruleChangeDao = getDao(map, RuleChangeDao.class);
projectExportDao = getDao(map, ProjectExportDao.class);
issueFixedDao = getDao(map, IssueFixedDao.class);
}

public DbSession openSession(boolean batch) {
@@ -335,6 +338,10 @@ public class DbClient {
return issueChangeDao;
}

public IssueFixedDao issueFixedDao() {
return issueFixedDao;
}

public QualityProfileDao qualityProfileDao() {
return qualityProfileDao;
}

+ 2
- 0
server/sonar-db-dao/src/main/java/org/sonar/db/MyBatis.java View File

@@ -77,6 +77,7 @@ import org.sonar.db.issue.ImpactDto;
import org.sonar.db.issue.IssueChangeDto;
import org.sonar.db.issue.IssueChangeMapper;
import org.sonar.db.issue.IssueDto;
import org.sonar.db.issue.IssueFixedMapper;
import org.sonar.db.issue.IssueMapper;
import org.sonar.db.issue.NewCodeReferenceIssueDto;
import org.sonar.db.issue.PrIssueDto;
@@ -301,6 +302,7 @@ public class MyBatis {
IsAliveMapper.class,
IssueChangeMapper.class,
IssueMapper.class,
IssueFixedMapper.class,
MeasureMapper.class,
MetricMapper.class,
NewCodePeriodMapper.class,

+ 40
- 0
server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueFixedDao.java View File

@@ -0,0 +1,40 @@
/*
* SonarQube
* Copyright (C) 2009-2023 SonarSource SA
* mailto:info AT sonarsource DOT com
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package org.sonar.db.issue;

import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.sonar.db.Dao;
import org.sonar.db.DbSession;

public class IssueFixedDao implements Dao {

public void insert(DbSession dbSession, IssueFixedDto fixedIssue) {
mapper(dbSession).insert(fixedIssue);
}

private static IssueFixedMapper mapper(DbSession session) {
return session.getMapper(IssueFixedMapper.class);
}

public List<IssueFixedDto> selectByPullRequest(DbSession dbSession, @Param("pullRequestUuid") String pullRequestUuid) {
return mapper(dbSession).selectByPullRequest(pullRequestUuid);
}
}

+ 23
- 0
server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueFixedDto.java View File

@@ -0,0 +1,23 @@
/*
* SonarQube
* Copyright (C) 2009-2023 SonarSource SA
* mailto:info AT sonarsource DOT com
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package org.sonar.db.issue;

public record IssueFixedDto(String pullRequestUuid, String issueKey) {
}

+ 28
- 0
server/sonar-db-dao/src/main/java/org/sonar/db/issue/IssueFixedMapper.java View File

@@ -0,0 +1,28 @@
/*
* SonarQube
* Copyright (C) 2009-2023 SonarSource SA
* mailto:info AT sonarsource DOT com
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package org.sonar.db.issue;

import java.util.List;

public interface IssueFixedMapper {
void insert(IssueFixedDto dto);

List<IssueFixedDto> selectByPullRequest(String pullRequestUuid);
}

+ 22
- 0
server/sonar-db-dao/src/main/resources/org/sonar/db/issue/IssueFixedMapper.xml View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>

<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "mybatis-3-mapper.dtd">

<mapper namespace="org.sonar.db.issue.IssueFixedMapper">
<insert id="insert" parameterType="org.sonar.db.issue.IssueFixedDto">
INSERT INTO issues_fixed (
pull_request_uuid,
issue_key
) VALUES (
#{pullRequestUuid,jdbcType=VARCHAR},
#{issueKey,jdbcType=VARCHAR}
)
</insert>
<select id="selectByPullRequest" resultType="org.sonar.db.issue.IssueFixedDto">
SELECT
pull_request_uuid as pullRequestUuid,
issue_key as issueKey
FROM issues_fixed
WHERE pull_request_uuid = #{pullRequestUuid,jdbcType=VARCHAR}
</select>
</mapper>

Loading…
Cancel
Save