Commit cefd9122 authored by Noel Alonso's avatar Noel Alonso
Browse files

Comprueba si existe por el id de dataDefinition 

Por error, se estaba comprobando con el id de la fixedMeasurement
parent 7fd1eed9

src/main/java/es/redmic/db/geodata/properties/fixedsurvey/model/FixedMeasurement.java

+8 −9
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ import javax.persistence.Table; 
import es.redmic.databaselib.common.model.LongModel;

import es.redmic.db.maintenance.parameter.model.DataDefinition;





/**

 * The persistent class for the measurement database table.

 *
@@ -27,11 +26,11 @@ public class FixedMeasurement extends LongModel implements Serializable { 
	private double z;



	// bi-directional many-to-one association to Surveystation

	@ManyToOne

	@ManyToOne(fetch = FetchType.LAZY)

	@JoinColumn(name = "fixedsurveyid", nullable = false)

	private FixedSurvey fixedSurvey;



	@ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)

	@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)

	@JoinColumn(name = "datadefinitionid", nullable = false, unique = true)

	private DataDefinition dataDefinition;

src/main/java/es/redmic/db/series/common/service/GeoSeriesService.java

+3 −2
Original line number Diff line number Diff line
@@ -155,13 +155,14 @@ public abstract class GeoSeriesService<TModel extends FixedSurvey, TDTO extends 
			boolean found = false;

			FixedMeasurement fixedMeasurement = fixedMeasurements.get(i);

			for (int j = 0; j < measurements.size(); j++) {

				if (measurements.get(j).getDataDefinition().getId().equals(fixedMeasurement.getId())) {

				if (measurements.get(j).getDataDefinition().getId()

						.equals(fixedMeasurement.getDataDefinition().getId())) {

					found = true;

					break;

				}

			}

			if (found == false) {

				Long dataDefinitionId = fixedMeasurement.getId();

				Long dataDefinitionId = fixedMeasurement.getDataDefinition().getId();

				fixedMeasurementRepository.delete(fixedMeasurement);

				dataDefinitionService.delete(dataDefinitionId);

			}