Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c1fb83d2 by Tony Chemit at 2023-01-24T08:01:11+01:00 Revue de migration de Activity.schoolType - Closes #2485 - - - - - 1 changed file: - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityReader.java Changes: ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityReader.java ===================================== @@ -228,6 +228,7 @@ public class ActivityReader extends DataReader<Activity> { String vesselActivityCode = resultSet.getString(13); Object setCountObject = resultSet.getObject(14); Integer setCount = setCountObject == null ? null : ((Number) setCountObject).intValue(); + String schoolTypeCode = resultSet.getString(15); switch (vesselActivityCode) { case "0": // SetSuccessStatus=0 + ReasonForNullSet=0 (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2091) @@ -235,18 +236,24 @@ public class ActivityReader extends DataReader<Activity> { entity.setReasonForNullSet(dataContext.getReasonForNullSet0()); // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2610 entity.setSetCount(setCount); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2485 + entity.setSchoolType(dataContext.getSchoolType(schoolTypeCode)); break; case "1": // SetSuccessStatus=1 (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2091) entity.setSetSuccessStatus(dataContext.getSetSuccessStatus1()); // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2610 entity.setSetCount(setCount); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2485 + entity.setSchoolType(dataContext.getSchoolType(schoolTypeCode)); break; case "2": // SetSuccessStatus=2 (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2091) entity.setSetSuccessStatus(dataContext.getSetSuccessStatus2()); // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2610 entity.setSetCount(setCount); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2485 + entity.setSchoolType(dataContext.getSchoolType(schoolTypeCode)); break; case "14": // (See https://gitlab.com/ultreiaio/ird-observe/-/issues/2429) // SetSuccessStatus=2 @@ -255,11 +262,11 @@ public class ActivityReader extends DataReader<Activity> { entity.addObservedSystem(dataContext.getObservedSystem110()); // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2610 entity.setSetCount(setCount); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2485 + entity.setSchoolType(dataContext.getSchoolType(schoolTypeCode)); break; } entity.setVesselActivity(dataContext.getVesselActivity(vesselActivityCode)); - String schoolTypeCode = resultSet.getString(15); - entity.setSchoolType(dataContext.getSchoolType(schoolTypeCode)); Object fDonOrg = resultSet.getObject(16); if (fDonOrg != null) { boolean originalDataModified = Objects.equals(fDonOrg + "", "0"); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c1fb83d2883489e3ed424577da... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/c1fb83d2883489e3ed424577da... You're receiving this email because of your account on gitlab.com.