clean up code

UNC-Libraries · Mar 13, 2024 · b40f3a8 · b40f3a8
1 parent 7088bd3
commit b40f3a8
Showing 1 changed file with 5 additions and 14 deletions.
diff --git a/src/main/java/edu/unc/lib/boxc/migration/cdm/services/PermissionsService.java b/src/main/java/edu/unc/lib/boxc/migration/cdm/services/PermissionsService.java
@@ -299,10 +299,11 @@ private List<List<String>> updateCsvRecords(PermissionMappingOptions options) {
 
         // addedAndUpdatedIds: list of all ids that need to be added and updated
         if (options.getCdmId() != null) {
+            workAndFileRecords.add(new AbstractMap.SimpleEntry<>(options.getCdmId(), getObjectType(options.getCdmId())));
             addedAndUpdatedIds.add(options.getCdmId());
         }
         if (options.isWithWorks() || options.isWithFiles()) {
-            workAndFileRecords = queryForMappedIds(options);
+            workAndFileRecords.addAll(queryForMappedIds(options));
             Set<String> workFileIds = workAndFileRecords.stream().map(Map.Entry::getKey).collect(Collectors.toSet());
             addedAndUpdatedIds.addAll(workFileIds);
         }
@@ -318,12 +319,6 @@ private List<List<String>> updateCsvRecords(PermissionMappingOptions options) {
             }
         }
 
-        // add one new entry
-        if (addedAndUpdatedIds.contains(options.getCdmId())) {
-            String objectType = getObjectType(options.getCdmId());
-            updatedRecords.add(Arrays.asList(options.getCdmId(), objectType, everyoneField, authenticatedField));
-        }
-
         // add new works or files entries
         for (Map.Entry<String, String> workAndFileRecord : workAndFileRecords) {
             if (addedAndUpdatedIds.contains(workAndFileRecord.getKey())) {
@@ -335,13 +330,9 @@ private List<List<String>> updateCsvRecords(PermissionMappingOptions options) {
         updatedRecords.sort(Comparator.comparing(entry -> entry.get(0)));
         // move default entry to top if it exists
         List<String> updatedIds = updatedRecords.stream().map(entry -> entry.get(0)).collect(Collectors.toList());
-        int i = 0;
-        for (String id : updatedIds) {
-            if (id.equals(PermissionsInfo.DEFAULT_ID)) {
-                List<String> defaultEntry = updatedRecords.remove(i);
-                updatedRecords.add(0, defaultEntry);
-            }
-            i++;
+        if (updatedIds.contains(PermissionsInfo.DEFAULT_ID)) {
+            List<String> defaultEntry = updatedRecords.remove(updatedIds.indexOf(PermissionsInfo.DEFAULT_ID));
+            updatedRecords.add(0, defaultEntry);
         }
 
         return updatedRecords;