From c6cf430574840fc635dd8782a5527a59d9694177 Mon Sep 17 00:00:00 2001
From: David Conneely <899881+dconneely@users.noreply.github.com>
Date: Thu, 16 Jan 2025 12:30:54 +0000
Subject: [PATCH] Changed FDC selection to restrict to SENT rows

---
 .gitignore                                                | 2 ++
 .../dao/integration/CaseMigrationRepository.java          | 8 ++++----
 .../premigconcor/dao/maat/FdcContributionRepository.java  | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9049a77..2476f29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,8 @@
 !**/src/main/**/*.log
 !**/src/test/**/*.log
 
+*_premigconcor-*.csv
+
 ### Exclude .run run configurations - may contain confidential env-vars.
 .run/
 
diff --git a/premigconcor/src/main/java/uk/gov/justice/laadces/premigconcor/dao/integration/CaseMigrationRepository.java b/premigconcor/src/main/java/uk/gov/justice/laadces/premigconcor/dao/integration/CaseMigrationRepository.java
index e664e41..7691691 100644
--- a/premigconcor/src/main/java/uk/gov/justice/laadces/premigconcor/dao/integration/CaseMigrationRepository.java
+++ b/premigconcor/src/main/java/uk/gov/justice/laadces/premigconcor/dao/integration/CaseMigrationRepository.java
@@ -64,9 +64,9 @@ public int[] removeExisting(final Collection<CaseMigration> caseMigrations) {
                 FROM case_migration
                 """, rs -> {
             final var caseMigration = CaseMigration.ofPrimaryKey(rs.getLong(1), rs.getLong(2), rs.getLong(3));
-            ++counts[0];
+            ++counts[0]; // total
             if (caseMigrations.remove(caseMigration)) {
-                ++counts[1];
+                ++counts[1]; // removed
             }
         });
         return counts; // size of case_migration table, duplicates between caseMigrations parameter and database table.
@@ -89,9 +89,9 @@ public List<CaseMigration> renumberBatchIds(Collection<CaseMigration> caseMigrat
                 renumbered.add(caseMigration); // has a batch_id already.
             } else {
                 if (caseMigration.concorContributionId() > 0) {
-                    renumbered.add(caseMigration.withBatchId((counts[0]++) / CONCOR_BATCH_ID_DIVISOR));
+                    renumbered.add(caseMigration.withBatchId((counts[0]++) / CONCOR_BATCH_ID_DIVISOR)); // concors
                 } else {
-                    renumbered.add(caseMigration.withBatchId((counts[1]++) / FDC_BATCH_ID_DIVISOR));
+                    renumbered.add(caseMigration.withBatchId((counts[1]++) / FDC_BATCH_ID_DIVISOR)); // fdcs
                 }
             }
         });
diff --git a/premigconcor/src/main/java/uk/gov/justice/laadces/premigconcor/dao/maat/FdcContributionRepository.java b/premigconcor/src/main/java/uk/gov/justice/laadces/premigconcor/dao/maat/FdcContributionRepository.java
index 7f38da1..430f166 100644
--- a/premigconcor/src/main/java/uk/gov/justice/laadces/premigconcor/dao/maat/FdcContributionRepository.java
+++ b/premigconcor/src/main/java/uk/gov/justice/laadces/premigconcor/dao/maat/FdcContributionRepository.java
@@ -28,7 +28,7 @@ public void addLatestIdsByMaatIds(final List<Long> maatIds, final Collection<Cas
             foundFdcs.addAll(maat.sql("""
                         SELECT MAX(id), rep_id
                         FROM togdata.fdc_contributions
-                        WHERE rep_id IN (:maatIds)
+                        WHERE rep_id IN (:maatIds) AND status = 'SENT'
                         GROUP BY rep_id
                         """)
                     .paramSource(paramSource)