#112 | Use equals and null-safe checks

avniproject · Nov 21, 2024 · 1672ee2 · 1672ee2
1 parent cd021dd
commit 1672ee2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/org/avniproject/etl/repository/sync/CleanEncounterCancelTableAction.java b/src/main/java/org/avniproject/etl/repository/sync/CleanEncounterCancelTableAction.java
@@ -12,6 +12,7 @@
 
 import java.util.Arrays;
 import java.util.Date;
+import java.util.Objects;
 import java.util.Optional;
 
 import static org.avniproject.etl.repository.JdbcContextWrapper.runInOrgContext;
@@ -50,9 +51,9 @@ private void cleanUncancelledEncounters(TableMetadata tableMetadata, SchemaMetad
 
     private String getPrimaryTableName(TableMetadata tableMetadata, SchemaMetadata currentSchemaMetadata) {
         Optional<TableMetadata> primaryTableMetadata = currentSchemaMetadata.getAllIndividualAndProgramEncounterTables()
-                .stream().filter(tm -> tm.getEncounterTypeUuid() == tableMetadata.getEncounterTypeUuid()
-                        && tm.getProgramUuid() == tableMetadata.getProgramUuid()
-                        && tm.getSubjectTypeUuid() == tableMetadata.getSubjectTypeUuid()).findAny();
+                .stream().filter(tm -> tm.getEncounterTypeUuid().equals(tableMetadata.getEncounterTypeUuid())
+                        && (Objects.isNull(tm.getProgramUuid()) || (Objects.nonNull(tableMetadata.getProgramUuid()) && tableMetadata.getProgramUuid().equals(tm.getProgramUuid())))
+                        && tm.getSubjectTypeUuid().equals(tableMetadata.getSubjectTypeUuid())).findAny();
 
         if (primaryTableMetadata.isPresent()) {
             return primaryTableMetadata.get().getName();

diff --git a/src/main/java/org/avniproject/etl/repository/sync/CleanEnrolmentExitTableAction.java b/src/main/java/org/avniproject/etl/repository/sync/CleanEnrolmentExitTableAction.java
@@ -50,8 +50,8 @@ private void cleanInvalidExits(TableMetadata tableMetadata, SchemaMetadata curre
 
     private String getPrimaryTableName(TableMetadata tableMetadata, SchemaMetadata currentSchemaMetadata) {
         Optional<TableMetadata> primaryTableMetadata = currentSchemaMetadata.getAllProgramEnrolmentTables()
-                .stream().filter(tm -> tm.getProgramUuid() == tableMetadata.getProgramUuid()
-                        && tm.getSubjectTypeUuid() == tableMetadata.getSubjectTypeUuid()).findAny();
+                .stream().filter(tm -> tm.getProgramUuid().equals(tableMetadata.getProgramUuid())
+                        && tm.getSubjectTypeUuid().equals(tableMetadata.getSubjectTypeUuid())).findAny();
 
         if (primaryTableMetadata.isPresent()) {
             return primaryTableMetadata.get().getName();