Añade qFlag y vFlag por defecto + tests (53817cc4) · Commits · REDMIC Project / Server / Vessel / Vessels

vessels-commands/src/main/java/es/redmic/vesselscommands/service/VesselTrackingCommandService.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -31,6 +31,12 @@ public class VesselTrackingCommandService implements CommandGeoServiceItfc<Vesse
		@Value("${vesseltracking-activity-id}")
		protected String activityId;

		@Value("${qflag.default}")
		private String QFLAG_DEFAUL;

		@Value("${vflag.default}")
		private String VFLAG_DEFAULT;

		@Autowired
		public VesselTrackingCommandService(VesselTrackingCommandHandler commandHandler) {
		this.commandHandler = commandHandler;
		@@ -85,7 +91,7 @@ public class VesselTrackingCommandService implements CommandGeoServiceItfc<Vesse
		throw new FieldNotValidException("activityId", requestId);
		}

		public static VesselTrackingDTO convertTrackToVesselTracking(AISTrackingDTO aisTracking) {
		public VesselTrackingDTO convertTrackToVesselTracking(AISTrackingDTO aisTracking) {

		if (aisTracking.getMmsi() == null)
		throw new FieldNotValidException("mmsi", "null");
		@@ -114,6 +120,8 @@ public class VesselTrackingCommandService implements CommandGeoServiceItfc<Vesse
		properties.setNavStat(aisTracking.getNavStat());
		properties.setDest(aisTracking.getDest());
		properties.setEta(aisTracking.getEta());
		properties.setQFlag(QFLAG_DEFAUL);
		properties.setVFlag(VFLAG_DEFAULT);

		vesselTracking.setProperties(properties);

vessels-commands/src/test/java/es/redmic/test/vesselscommands/integration/vesseltracking/VesselTrackingDataUtil.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -231,6 +231,8 @@ public abstract class VesselTrackingDataUtil {
		properties.setNavStat(33);
		properties.setDest("Santa Cruz de Tenerife");
		properties.setEta("00:00 00:00");
		properties.setQFlag("0");
		properties.setVFlag("N");

		return vesselTracking;
		}

vessels-commands/src/test/resources/data/schemas/vesseltrackingschema.json

+1 −1

Original line number	Diff line number	Diff line
		{"$schema":"http://json-schema.org/draft-04/schema#","title":"Vessel Tracking DTO","type":"object","properties":{"id":{"type":["string","null"]},"uuid":{"type":["string","null"]},"properties":{"$ref":"#/definitions/VesselTrackingPropertiesDTO"},"geometry":{"type":"object","additionalProperties":false,"properties":{"type":{"type":"string","enum":["Point"],"default":"Point"},"coordinates":{"type":"array","items":{"type":"number","maximum":9000000000000000,"minimum":-9000000000000000},"minItems":2,"maxItems":2}},"required":["type","coordinates"]}},"required":["properties","geometry"],"definitions":{"VesselTrackingPropertiesDTO":{"type":"object","properties":{"vessel":{"type":"integer","url":"none"},"date":{"type":"string","format":"date-time"},"cog":{"type":["number","null"]},"sog":{"type":["number","null"]},"heading":{"type":["integer","null"]},"navStat":{"type":["integer","null"]},"dest":{"type":["string","null"]},"eta":{"type":["string","null"]}},"required":["vessel","date"]}}}
		No newline at end of file
		{"$schema":"http://json-schema.org/draft-04/schema#","title":"Vessel Tracking DTO","type":"object","properties":{"id":{"type":["string","null"]},"uuid":{"type":["string","null"]},"properties":{"$ref":"#/definitions/VesselTrackingPropertiesDTO"},"geometry":{"type":"object","additionalProperties":false,"properties":{"type":{"type":"string","enum":["Point"],"default":"Point"},"coordinates":{"type":"array","items":{"type":"number","maximum":9000000000000000,"minimum":-9000000000000000},"minItems":2,"maxItems":2}},"required":["type","coordinates"]}},"required":["properties","geometry"],"definitions":{"VesselTrackingPropertiesDTO":{"type":"object","properties":{"vessel":{"type":"integer","url":"none"},"date":{"type":"string","format":"date-time"},"cog":{"type":["number","null"]},"sog":{"type":["number","null"]},"heading":{"type":["integer","null"]},"navStat":{"type":["integer","null"]},"dest":{"type":["string","null"]},"eta":{"type":["string","null"]},"qFlag":{"type":"string","default":"0"},"vFlag":{"type":"string","default":"N"}},"required":["vessel","date","qFlag","vFlag"]}}}
		No newline at end of file