From 294aa6c7730e8ca32fac93119127377f0841f376 Mon Sep 17 00:00:00 2001
From: Raman Arora <raman@basistech.com>
Date: Wed, 4 Mar 2020 14:44:55 -0500
Subject: [PATCH] Ensure default content gets populated in Accounts related
 tables.

---
 .../datamodel/RdbmsCentralRepoFactory.java    | 50 +++++++++++++++----
 1 file changed, 39 insertions(+), 11 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/RdbmsCentralRepoFactory.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/RdbmsCentralRepoFactory.java
index db7343ad50..09f103a038 100644
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/RdbmsCentralRepoFactory.java
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/RdbmsCentralRepoFactory.java
@@ -192,7 +192,8 @@ public class RdbmsCentralRepoFactory {
             }
 
             result = CentralRepoDbUtil.insertDefaultCorrelationTypes(conn)
-                    && CentralRepoDbUtil.insertDefaultOrganization(conn);
+                    && CentralRepoDbUtil.insertDefaultOrganization(conn) &&
+                    insertDefaultAccountsTablesContent(conn);
                     // @TODO: uncomment when ready to create/populate persona tables
                    // && insertDefaultPersonaTablesContent(conn);
 
@@ -765,6 +766,43 @@ public class RdbmsCentralRepoFactory {
     }
 
     
+     /**
+      * Inserts the default content in accounts related tables.
+      * 
+      * @param conn Database connection to use.
+      * 
+      * @return True if success, false otherwise.
+      */
+    private boolean insertDefaultAccountsTablesContent(Connection conn) {
+          Statement stmt = null;
+        try {
+            stmt = conn.createStatement();
+             
+            // Populate the account_types table
+            for (Account.Type type : Account.Type.PREDEFINED_ACCOUNT_TYPES) {
+                int correlationTypeId = getCorrelationTypeIdForAccountType(conn, type);
+                if (correlationTypeId > 0) {
+                    String sqlString = String.format("INSERT INTO account_types (type_name, display_name, correlation_type_id) VALUES ('%s', '%s', %d)" + getOnConflictDoNothingClause(selectedPlatform), 
+                                                        type.getTypeName(), type.getDisplayName(), correlationTypeId);
+                    stmt.execute(sqlString);
+                }
+            }
+        } catch (SQLException ex) {
+            LOGGER.log(Level.SEVERE, String.format("Failed to populate default data in Accounts tables."), ex);
+            return false;
+        } finally {
+            if (stmt != null) {
+                try {
+                    stmt.close();
+                } catch (SQLException ex2) {
+                     LOGGER.log(Level.SEVERE, "Error closing statement.", ex2);
+                }
+            }
+        }
+
+        return true;
+    }
+    
      /**
       * Inserts the default content in persona related tables.
       * 
@@ -792,16 +830,6 @@ public class RdbmsCentralRepoFactory {
                 stmt.execute(sqlString);
             }
             
-            // Populate the account_types table
-            for (Account.Type type : Account.Type.PREDEFINED_ACCOUNT_TYPES) {
-                int correlationTypeId = getCorrelationTypeIdForAccountType(conn, type);
-                if (correlationTypeId > 0) {
-                    String sqlString = String.format("INSERT INTO account_types (type_name, display_name, correlation_type_id) VALUES ('%s', '%s', %d)" + getOnConflictDoNothingClause(selectedPlatform), 
-                                                        type.getTypeName(), type.getDisplayName(), correlationTypeId);
-                    stmt.execute(sqlString);
-                }
-            }
-            
         } catch (SQLException ex) {
             LOGGER.log(Level.SEVERE, String.format("Failed to populate default data in Persona tables."), ex);
             return false;