Handle duplicate account number while reading account file

AY2324S2-CS2113-T15-2 · Apr 13, 2024 · 4b32adf · 4b32adf
1 parent 5da6d9c
commit 4b32adf
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/main/java/budgetbuddy/storage/DataStorage.java b/src/main/java/budgetbuddy/storage/DataStorage.java
@@ -130,7 +130,7 @@ private static void createDataFolderIfNotExists() throws IOException {
         }
     }
 
-    public ArrayList<Account> readAccountFile() throws IOException, FileCorruptedException {
+    public ArrayList<Account> readAccountFile(ArrayList<Integer> existingAccountNumbers) throws IOException, FileCorruptedException {
         File f = new File(ACCOUNTS_FILE_PATH);
         Scanner s = new Scanner(f);
 
@@ -164,7 +164,12 @@ public ArrayList<Account> readAccountFile() throws IOException, FileCorruptedExc
                 throw new FileCorruptedException("Invalid account name");
             }
 
+            if (existingAccountNumbers.contains(accountNumber)) {
+                throw new FileCorruptedException("Duplicate account number");
+            }
+
             accounts.add(new Account(accountNumber, accountInfo[1], balance));
+            existingAccountNumbers.add(accountNumber);
         }
         return accounts;
     }
@@ -204,20 +209,17 @@ public AccountManager loadAccounts() {
                 }
                 return createNewAccountManager();
             }
+            ArrayList<Integer> existingAccountNumbers = new ArrayList<>();
             ArrayList<Account> accounts = null;
             try {
-                accounts = readAccountFile();
+                accounts = readAccountFile(existingAccountNumbers);
             } catch (FileCorruptedException e) {
                 UserInterface.printFileCorruptedError();
                 return createNewAccountManager();
             }
             if (accounts.isEmpty()) {
                 return createNewAccountManager();
             }
-            ArrayList<Integer> existingAccountNumbers = new ArrayList<>();
-            for (Account account : accounts) {
-                existingAccountNumbers.add(account.getAccountNumber());
-            }
             return new AccountManager(accounts, existingAccountNumbers);
         } catch (IOException e) {
             UserInterface.printFileCorruptedError();