SONAR-6260 Fix snapshot id when persisting measures

server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java

@@ -93,8 +93,7 @@ public class PersistMeasuresStep implements ComputationStep {
     protected void visitAny(Component component) {
       int componentRef = component.getRef();
       List<BatchReport.Measure> measures = reportReader.readComponentMeasures(componentRef);
-      persistMeasures(measures, dbIdsRepository.getComponentId(component), dbIdsRepository.getComponentId(component));
-
+      persistMeasures(measures, dbIdsRepository.getComponentId(component), dbIdsRepository.getSnapshotId(component));
     }
 
     private void persistMeasures(List<BatchReport.Measure> batchReportMeasures, long componentId, long snapshotId) {

server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistMeasuresStepTest.java

@@ -172,7 +172,7 @@ public class PersistMeasuresStepTest extends BaseStepTest {
         "rule_priority as \"severity\" from project_measures");
 
     Map<String, Object> dto = dtos.get(0);
-    assertThat(dto.get("snapshotId")).isNotNull();
+    assertThat(dto.get("snapshotId")).isEqualTo(3L);
     assertThat(dto.get("componentId")).isEqualTo(projectDto.getId());
     assertThat(dto.get("metricId")).isEqualTo(metric.getId().longValue());
     assertThat(dto.get("ruleId")).isEqualTo(rule.getId().longValue());
@@ -180,7 +180,7 @@ public class PersistMeasuresStepTest extends BaseStepTest {
     assertThat(dto.get("severity")).isEqualTo(0L);
 
     dto = dtos.get(1);
-    assertThat(dto.get("snapshotId")).isNotNull();
+    assertThat(dto.get("snapshotId")).isEqualTo(4L);
     assertThat(dto.get("componentId")).isEqualTo(fileDto.getId());
     assertThat(dto.get("metricId")).isEqualTo(metric.getId().longValue());
     assertThat(dto.get("ruleId")).isEqualTo(rule.getId().longValue());