SONAR-6610 selectByComponentId for Custom Measures

server/sonar-server/src/main/java/org/sonar/server/custommeasure/persistence/CustomMeasureDao.java

@@ -56,6 +56,10 @@ public List<CustomMeasureDto> selectByMetricId(DbSession session, int id) {
     return mapper(session).selectByMetricId(id);
   }
 
+  public List<CustomMeasureDto> selectByComponentId(DbSession session, int id) {
+    return mapper(session).selectByComponentId(id);
+  }
+
   private CustomMeasureMapper mapper(DbSession session) {
     return session.getMapper(CustomMeasureMapper.class);
   }

server/sonar-server/src/test/java/org/sonar/server/custommeasure/persistence/CustomMeasureDaoTest.java

@@ -21,6 +21,7 @@
 package org.sonar.server.custommeasure.persistence;
 
 import java.util.Arrays;
+import java.util.List;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.ClassRule;
@@ -34,6 +35,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.offset;
+import static org.sonar.server.custommeasure.persistence.CustomMeasureTesting.newCustomMeasureDto;
 
 @Category(DbTests.class)
 public class CustomMeasureDaoTest {
@@ -58,14 +60,14 @@ public void tearDown() {
 
   @Test
   public void insert() {
-    CustomMeasureDto measure = CustomMeasureTesting.newDto();
+    CustomMeasureDto measure = newCustomMeasureDto();
 
     sut.insert(session, measure);
 
     CustomMeasureDto result = sut.selectNullableById(session, measure.getId());
     assertThat(result.getId()).isEqualTo(measure.getId());
     assertThat(result.getMetricId()).isEqualTo(measure.getMetricId());
-    assertThat(result.getResourceId()).isEqualTo(measure.getResourceId());
+    assertThat(result.getComponentId()).isEqualTo(measure.getComponentId());
     assertThat(result.getDescription()).isEqualTo(measure.getDescription());
     assertThat(result.getUserLogin()).isEqualTo(measure.getUserLogin());
     assertThat(result.getTextValue()).isEqualTo(measure.getTextValue());
@@ -76,12 +78,26 @@ public void insert() {
 
   @Test
   public void delete() {
-    CustomMeasureDto measure = CustomMeasureTesting.newDto();
+    CustomMeasureDto measure = newCustomMeasureDto();
     sut.insert(session, measure);
     assertThat(sut.selectNullableById(session, measure.getId())).isNotNull();
 
     sut.deleteByMetricIds(session, Arrays.asList(measure.getMetricId()));
 
     assertThat(sut.selectNullableById(session, measure.getId())).isNull();
   }
+
+  @Test
+  public void select_by_component_id() {
+    sut.insert(session, newCustomMeasureDto().setComponentId(1));
+    sut.insert(session, newCustomMeasureDto().setComponentId(1));
+    sut.insert(session, newCustomMeasureDto().setComponentId(2));
+    session.commit();
+
+    List<CustomMeasureDto> result = sut.selectByComponentId(session, 1);
+
+    assertThat(result).hasSize(2);
+    assertThat(result).extracting("componentId").containsOnly(1);
+
+  }
 }

server/sonar-server/src/test/java/org/sonar/server/custommeasure/persistence/CustomMeasureTesting.java

@@ -30,14 +30,14 @@ private CustomMeasureTesting() {
     // static stuff only
   }
 
-  public static CustomMeasureDto newDto() {
+  public static CustomMeasureDto newCustomMeasureDto() {
     return new CustomMeasureDto()
       .setDescription(RandomStringUtils.randomAlphanumeric(255))
       .setTextValue(RandomStringUtils.randomAlphanumeric(255))
       .setUserLogin(RandomStringUtils.randomAlphanumeric(255))
       .setValue(RandomUtils.nextDouble())
       .setMetricId(RandomUtils.nextInt())
-      .setResourceId(RandomUtils.nextInt())
+      .setComponentId(RandomUtils.nextInt())
       .setCreatedAt(System2.INSTANCE.now())
       .setUpdatedAt(System2.INSTANCE.now())
       ;

server/sonar-server/src/test/java/org/sonar/server/metric/ws/CreateActionTest.java

@@ -204,7 +204,7 @@ public void fail_when_metric_type_is_changed_and_associated_measures_exist() thr
       .setUserManaged(true)
       .setEnabled(false);
     dbClient.metricDao().insert(dbSession, metric);
-    dbClient.customMeasureDao().insert(dbSession, CustomMeasureTesting.newDto().setMetricId(metric.getId()));
+    dbClient.customMeasureDao().insert(dbSession, CustomMeasureTesting.newCustomMeasureDto().setMetricId(metric.getId()));
     dbSession.commit();
 
     newRequest()

server/sonar-server/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java

@@ -117,8 +117,8 @@ public void do_not_delete_non_custom_metric() throws Exception {
   public void delete_associated_measures() throws Exception {
     MetricDto metric = newCustomEnabledMetric(1);
     metricDao.insert(dbSession, metric);
-    CustomMeasureDto customMeasure = CustomMeasureTesting.newDto().setMetricId(metric.getId());
-    CustomMeasureDto undeletedCustomMeasure = CustomMeasureTesting.newDto().setMetricId(metric.getId() + 1);
+    CustomMeasureDto customMeasure = CustomMeasureTesting.newCustomMeasureDto().setMetricId(metric.getId());
+    CustomMeasureDto undeletedCustomMeasure = CustomMeasureTesting.newCustomMeasureDto().setMetricId(metric.getId() + 1);
     dbClient.customMeasureDao().insert(dbSession, customMeasure);
     dbClient.customMeasureDao().insert(dbSession, undeletedCustomMeasure);
     dbSession.commit();

sonar-core/src/main/java/org/sonar/core/custommeasure/db/CustomMeasureDto.java

@@ -23,7 +23,7 @@
 public class CustomMeasureDto {
   private long id;
   private int metricId;
-  private int resourceId;
+  private int componentId;
   private double value;
   private String textValue;
   private String userLogin;
@@ -67,12 +67,12 @@ public CustomMeasureDto setValue(double value) {
     return this;
   }
 
-  public int getResourceId() {
-    return resourceId;
+  public int getComponentId() {
+    return componentId;
   }
 
-  public CustomMeasureDto setResourceId(int resourceId) {
-    this.resourceId = resourceId;
+  public CustomMeasureDto setComponentId(int resourceId) {
+    this.componentId = resourceId;
     return this;
   }
 

sonar-core/src/main/java/org/sonar/core/custommeasure/db/CustomMeasureMapper.java

@@ -31,4 +31,7 @@ public interface CustomMeasureMapper {
   CustomMeasureDto selectById(long id);
 
   List<CustomMeasureDto> selectByMetricId(int id);
+
+  List<CustomMeasureDto> selectByComponentId(int id);
+
 }

sonar-core/src/main/resources/org/sonar/core/custommeasure/db/CustomMeasureMapper.xml

@@ -5,7 +5,7 @@
   <sql id="selectColumns">
     m.id,
     m.metric_id as metricId,
-    m.resource_id as resourceId,
+    m.resource_id as componentId,
     m.value,
     m.text_value as textValue,
     m.user_login as userLogin,
@@ -28,12 +28,19 @@
     where m.metric_id=#{metricId}
   </select>
 
+  <select id="selectByComponentId" resultType="CustomMeasure">
+    select
+    <include refid="selectColumns"/>
+    from manual_measures m
+    where m.resource_id=#{componentId}
+  </select>
+
   <insert id="insert" parameterType="CustomMeasure" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
     INSERT INTO manual_measures (
     metric_id, resource_id, value, text_value, user_login, description, created_at, updated_at
     )
     VALUES (
-    #{metricId, jdbcType=INTEGER}, #{resourceId, jdbcType=INTEGER}, #{value, jdbcType=DOUBLE},
+    #{metricId, jdbcType=INTEGER}, #{componentId, jdbcType=INTEGER}, #{value, jdbcType=DOUBLE},
     #{textValue, jdbcType=VARCHAR}, #{userLogin, jdbcType=VARCHAR},#{description, jdbcType=VARCHAR},
     #{createdAt, jdbcType=BIGINT}, #{updatedAt, jdbcType=BIGINT}
     )