fix(deleteSat): fixing delete in sat not working

Author: ooemperor

pkg/builder/InbRdv.go

@@ -57,7 +57,7 @@ func BuildInbRdvSatDeleteQuery(tableName string) (string, error) {
 	script += "SET delete_dts = NOW() "
 	script += fmt.Sprintf("FROM rdv.%s_sat AS s ", tableName)
 	script += fmt.Sprintf("LEFT JOIN rdv.%s_sat_cur AS sc on s.frh = sc.frh ", tableName)
-	script += "WHERE s.frh IS NULL;"
+	script += "WHERE sc.frh IS NULL AND s.delete_dts IS NULL;"
 	// script += fmt.Sprintf("WHERE frh NOT IN (SELECT frh FROM rdv.%s_sat_cur) ", tableName)
 	// script += "AND delete_dts IS NULL;"
 

pkg/builder/InbRdv_test.go

@@ -68,7 +68,7 @@ func TestBuildInbRdvSatDeleteQuery(t *testing.T) {
 	// 	t.Fatalf("BuildInbRdvSatDeleteQuery incorrect: %v", query)
 	// }
 
-	if query != "UPDATE rdv.TestTable_sat SET delete_dts = NOW() FROM rdv.TestTable_sat AS s LEFT JOIN rdv.TestTable_sat_cur AS sc on s.frh = sc.frh WHERE s.frh IS NULL;" {
+	if query != "UPDATE rdv.TestTable_sat SET delete_dts = NOW() FROM rdv.TestTable_sat AS s LEFT JOIN rdv.TestTable_sat_cur AS sc on s.frh = sc.frh WHERE sc.frh IS NULL AND s.delete_dts IS NULL;" {
 		t.Fatalf("BuildInbRdvSatDeleteQuery incorrect: %v", query)
 	}
 }

pkg/pipeline/inbrdv/RdvPipelineBuilder_test.go

@@ -140,7 +140,7 @@ func TestRdvPipeline_buildSatMarkDelete(t *testing.T) {
 		wantErr bool
 	}{
 		{name: "SatCurDeleteTest1", fields: fields{nil, ""}, want: nil, wantErr: true},
-		{name: "SatCurDeleteTest2", fields: fields{nil, "testTableDelete"}, want: processors.NewSQLExecutor(nil, "UPDATE rdv.testTableDelete_sat SET delete_dts = NOW() FROM rdv.testTableDelete_sat AS s LEFT JOIN rdv.testTableDelete_sat_cur AS sc on s.frh = sc.frh WHERE s.frh IS NULL;"), wantErr: false},
+		{name: "SatCurDeleteTest2", fields: fields{nil, "testTableDelete"}, want: processors.NewSQLExecutor(nil, "UPDATE rdv.testTableDelete_sat SET delete_dts = NOW() FROM rdv.testTableDelete_sat AS s LEFT JOIN rdv.testTableDelete_sat_cur AS sc on s.frh = sc.frh WHERE sc.frh IS NULL AND s.delete_dts IS NULL;"), wantErr: false},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {