Merge branch 'dev_batchflag' into develop

src/main/java/com/snp/batch/jobs/compliance/batch/repository/ComplianceRepositoryImpl.java

@@ -53,10 +53,10 @@ public class ComplianceRepositoryImpl extends BaseJdbcRepository<ComplianceEntit
                       shipownerswisssanctionlist, shipowneruaesanctionlist, shipownerunsanctionlist,
                       shipsanctionedcountryportcalllast12m, shipsanctionedcountryportcalllast3m, shipsanctionedcountryportcalllast6m,
                       shipsecuritylegaldisputeevent, shipstspartnernoncompliancelast12m, shipswisssanctionlist,
-                      shipunsanctionlist, batch_flag
+                      shipunsanctionlist
                   )
                   VALUES (
-                      ?, ?::timestamptz, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'N'
+                      ?, ?::timestamptz, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
                   )
                   ON CONFLICT (lrimoshipno, dateamended)
                   DO UPDATE SET
@@ -92,8 +92,7 @@ public class ComplianceRepositoryImpl extends BaseJdbcRepository<ComplianceEntit
                       shipsecuritylegaldisputeevent = EXCLUDED.shipsecuritylegaldisputeevent,
                       shipstspartnernoncompliancelast12m = EXCLUDED.shipstspartnernoncompliancelast12m,
                       shipswisssanctionlist = EXCLUDED.shipswisssanctionlist,
-                      shipunsanctionlist = EXCLUDED.shipunsanctionlist,
+                      shipunsanctionlist = EXCLUDED.shipunsanctionlist
-                      batch_flag = 'N';
                 """;
     }
 

src/main/java/com/snp/batch/jobs/event/batch/repository/EventRepositoryImpl.java

@@ -46,31 +46,7 @@ public class EventRepositoryImpl extends BaseJdbcRepository<EventDetailEntity, L
 
     @Override
     protected String getUpdateSql() {
-        return """
+        return null;
-                INSERT INTO snp_data.event (
-                    Event_ID, Incident_ID, IHSLRorIMOShipNo, Vessel_Name, Vessel_Type,
-                    Event_Type, Significance, Headline, Location_Name,
-                    Published_Date, Event_Start_Date, Event_End_Date, batch_flag
-                ) VALUES (
-                    ?, ?, ?, ?, ?,
-                    ?, ?, ?, ?,
-                    ?::timestamptz, ?::timestamptz, ?::timestamptz, 'N'
-                ) ON CONFLICT (Event_ID) DO UPDATE
-                SET
-                    Incident_ID = EXCLUDED.Incident_ID,
-                    IHSLRorIMOShipNo = EXCLUDED.IHSLRorIMOShipNo,
-                    Vessel_Name = EXCLUDED.Vessel_Name,
-                    Vessel_Type = EXCLUDED.Vessel_Type,
-                    Event_Type = EXCLUDED.Event_Type,
-                    Significance = EXCLUDED.Significance,
-                    Headline = EXCLUDED.Headline,
-                    Location_Name = EXCLUDED.Location_Name,
-                    Published_Date = EXCLUDED.Published_Date,
-                    Event_Start_Date = EXCLUDED.Event_Start_Date,
-                    Event_End_Date = EXCLUDED.Event_End_Date,
-                    batch_flag = 'N'
-                ;
-                """;
     }
 
     @Override

src/main/java/com/snp/batch/jobs/movement/batch/repository/PortCallsRepositoryImpl.java

@@ -120,7 +120,6 @@ public class PortCallsRepositoryImpl extends BaseJdbcRepository<PortCallsEntity,
                         teu = ?,
                         speedservice = ?,
                         mainenginetype = ?,
-                        batch_flag = 'N'::character varying,
                         status = ?,
                         operator = ?,
                         flagcode = ?,

src/main/java/com/snp/batch/jobs/risk/batch/repository/RiskRepositoryImpl.java

@@ -60,10 +60,10 @@ public class RiskRepositoryImpl extends BaseJdbcRepository<RiskEntity, Long> imp
                    singleshipoperation, singleshipoperationnarrative, fleetsafety, fleetsafetynarrative, fleetpsc,
                    fleetpscnarrative, specialsurveyoverdue, specialsurveyoverduenarrative, ownerunknown, ownerunknownnarrative,
                    russianportcall, russianportcallnarrative, russianownerregistration, russianownerregistrationnarrative,
-                   russiansts, russianstsnarrative, batch_flag
+                   russiansts, russianstsnarrative
                )
                VALUES (
-                   ?, ?::timestamptz, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'N'
+                   ?, ?::timestamptz, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
                )
                ON CONFLICT (lrno, lastupdated)
                DO UPDATE SET
@@ -148,8 +148,7 @@ public class RiskRepositoryImpl extends BaseJdbcRepository<RiskEntity, Long> imp
                    russianownerregistration = EXCLUDED.russianownerregistration,
                    russianownerregistrationnarrative = EXCLUDED.russianownerregistrationnarrative,
                    russiansts = EXCLUDED.russiansts,
-                   russianstsnarrative = EXCLUDED.russianstsnarrative,
+                   russianstsnarrative = EXCLUDED.russianstsnarrative
-                   batch_flag = 'N';
                 """;
     }