From 849775c46010395e67ddc951d72e26e876b377f8 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed>
Date: Thu, 2 Mar 2023 14:19:07 +0500
Subject: [PATCH 01/67] SQLite User Table

---
 ... codesync-intellij [publishPlugin].run.xml | 28 ++++++
 .run/Run [runIde].run.xml                     |  2 +-
 build.gradle                                  |  3 +
 src/main/.syncignore                          |  0
 .../sdk/codesync/DataClass/UserTable.java     | 76 ++++++++++++++++
 .../org/intellij/sdk/codesync/Database.java   | 30 +++++++
 .../codesync/ProjectOpenCloseListener.java    |  3 +
 .../java/org/intellij/sdk/codesync/db.java    | 90 +++++++++++++++++++
 .../intellij/sdk/codesync/files/UserFile.java | 27 ++++--
 src/main/main.iml                             | 11 +++
 src/test/test.iml                             | 11 +++
 11 files changed, 272 insertions(+), 9 deletions(-)
 create mode 100644 .run/3- codesync-intellij [publishPlugin].run.xml
 create mode 100644 src/main/.syncignore
 create mode 100644 src/main/java/org/intellij/sdk/codesync/DataClass/UserTable.java
 create mode 100644 src/main/java/org/intellij/sdk/codesync/Database.java
 create mode 100644 src/main/java/org/intellij/sdk/codesync/db.java
 create mode 100644 src/main/main.iml
 create mode 100644 src/test/test.iml

diff --git a/.run/3- codesync-intellij [publishPlugin].run.xml b/.run/3- codesync-intellij [publishPlugin].run.xml
new file mode 100644
index 00000000..d3f09903
--- /dev/null
+++ b/.run/3- codesync-intellij [publishPlugin].run.xml	
@@ -0,0 +1,28 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="3- codesync-intellij [publishPlugin]" type="GradleRunConfiguration" factoryName="Gradle">
+    <ExternalSystemSettings>
+      <option name="env">
+        <map>
+          <entry key="ORG_GRADLE_PROJECT_intellijPublishToken" value="" />
+        </map>
+      </option>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="publishPlugin" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/Run [runIde].run.xml b/.run/Run [runIde].run.xml
index e29b640a..683b70fd 100644
--- a/.run/Run [runIde].run.xml	
+++ b/.run/Run [runIde].run.xml	
@@ -3,7 +3,7 @@
     <ExternalSystemSettings>
       <option name="env">
         <map>
-          <entry key="env" value="dev" />
+          <entry key="env" value="prod" />
         </map>
       </option>
       <option name="executionName" />
diff --git a/build.gradle b/build.gradle
index 34939606..6b811aea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,6 +58,9 @@ dependencies {
     exclude group: 'org.slf4j'
   }
 
+  // https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc
+  implementation group: 'org.xerial', name: 'sqlite-jdbc', version: '3.40.0.0'
+
   implementation 'org.eclipse.jetty:jetty-server:9.4.3.v20170317'
   implementation 'org.eclipse.jetty:jetty-servlet:9.4.3.v20170317'
 
diff --git a/src/main/.syncignore b/src/main/.syncignore
new file mode 100644
index 00000000..e69de29b
diff --git a/src/main/java/org/intellij/sdk/codesync/DataClass/UserTable.java b/src/main/java/org/intellij/sdk/codesync/DataClass/UserTable.java
new file mode 100644
index 00000000..96cb4ba5
--- /dev/null
+++ b/src/main/java/org/intellij/sdk/codesync/DataClass/UserTable.java
@@ -0,0 +1,76 @@
+package org.intellij.sdk.codesync.DataClass;
+
+import org.intellij.sdk.codesync.Database;
+import org.intellij.sdk.codesync.files.UserFile;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+public class UserTable {
+
+    static String email;
+    static String access_token;
+    static String secret_key;
+    static String access_key;
+    static int is_active;
+
+    public static void update(UserFile.User user){
+        updateValues(user);
+        String query = "SELECT * FROM user WHERE email = '" + email + "'";
+        ArrayList<HashMap<String, String>> users = getRecords(query);
+        if(users != null && users.size() > 0){
+            query = "UPDATE user SET " +
+                    "access_token = '" + access_token +
+                    "', secret_key = '" + secret_key +
+                    "', access_key = '" + access_key +
+                    "', is_active = " + is_active +
+                    " WHERE email = '"+ email +"'";
+        }else{
+            query = "INSERT INTO user VALUES('"
+                    + email + "', '"
+                    + access_token + "', '"
+                    + secret_key + "', '"
+                    + access_key +"', '"
+                    + is_active + "')";
+        }
+        Database.executeUpdate(query);
+
+    }
+
+    static void updateValues(UserFile.User user){
+
+        email = user.getUserEmail() != null? user.getUserEmail() : "";
+        access_token = user.getAccessToken() != null? user.getAccessToken() : "";
+        secret_key = user.getSecretKey() != null? user.getSecretKey() : "";
+        access_key = user.getAccessKey() != null? user.getAccessKey() : "";
+        if(user.getActive() != null){
+            is_active = user.getActive()? 1 : 0;
+        }else{
+            is_active = 0;
+        }
+    }
+
+    public static Map<String, UserFile.User> getUsers(){
+        String query = "SELECT * FROM user";
+        Map<String, UserFile.User> users = new HashMap<>();
+        ArrayList<HashMap<String, Object>> usersArray = getRecords(query);
+        String userEmail;
+        Map<String, Object> userCredentials;
+        for(int i = 0; i < usersArray.size(); i++){
+            userCredentials = new HashMap<>();
+            userEmail = (String) usersArray.get(i).get("EMAIL");
+            userCredentials.put("access_key", usersArray.get(i).getOrDefault("ACCESS_KEY", null));
+            userCredentials.put("access_token", usersArray.get(i).getOrDefault("ACCESS_TOKEN", null));
+            userCredentials.put("secret_key", usersArray.get(i).getOrDefault("SECRET_KEY", null));
+            userCredentials.put("is_active", usersArray.get(i).getOrDefault("IS_ACTIVE", null).equals("1")? true : false);
+            UserFile.User user = new UserFile.User(userEmail, userCredentials);
+            users.put(userEmail, user);
+        }
+        return users;
+    }
+    static ArrayList getRecords(String query){
+        return Database.runQuery(query);
+    }
+
+}
diff --git a/src/main/java/org/intellij/sdk/codesync/Database.java b/src/main/java/org/intellij/sdk/codesync/Database.java
new file mode 100644
index 00000000..8f16ebda
--- /dev/null
+++ b/src/main/java/org/intellij/sdk/codesync/Database.java
@@ -0,0 +1,30 @@
+package org.intellij.sdk.codesync;
+
+import org.bouncycastle.jcajce.provider.digest.MD2;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+public class Database {
+
+    public static db instance;
+
+    public static void initiate() {
+
+        instance = new db();
+        instance.connect();
+    }
+
+    public static ArrayList runQuery(String query){
+        return instance.executeQuery(query);
+    }
+
+    public static void executeUpdate(String query){
+        instance.executeUpdate(query);
+    }
+
+    public static void disconnect(){
+        instance.disconnect();
+    }
+
+}
diff --git a/src/main/java/org/intellij/sdk/codesync/ProjectOpenCloseListener.java b/src/main/java/org/intellij/sdk/codesync/ProjectOpenCloseListener.java
index 2f0ed82e..97870d48 100644
--- a/src/main/java/org/intellij/sdk/codesync/ProjectOpenCloseListener.java
+++ b/src/main/java/org/intellij/sdk/codesync/ProjectOpenCloseListener.java
@@ -75,6 +75,8 @@ public void projectOpened(@NotNull Project project) {
       return;
     }
 
+    Database.initiate();
+
     // Acquire the lock now.
     // Keep a very low expiry to make sure, if user switches between projects then lock does not cause issues.
     Instant expiry = Instant.now().plus(5, ChronoUnit.SECONDS);
@@ -191,6 +193,7 @@ public void projectClosed(@NotNull Project project) {
   }
 
   public void disposeProjectListeners(Project project) {
+    Database.disconnect();
     // Release all the locks acquired by this project.
     CodeSyncLock.releaseAllLocks(LockFileType.PROJECT_LOCK, project.getName());
     CodeSyncLock.releaseAllLocks(LockFileType.HANDLE_BUFFER_LOCK, project.getName());
diff --git a/src/main/java/org/intellij/sdk/codesync/db.java b/src/main/java/org/intellij/sdk/codesync/db.java
new file mode 100644
index 00000000..71fe8b6a
--- /dev/null
+++ b/src/main/java/org/intellij/sdk/codesync/db.java
@@ -0,0 +1,90 @@
+package org.intellij.sdk.codesync;
+
+import com.intellij.vcs.log.Hash;
+
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+
+class db {
+    private Connection connection = null;
+
+    public void connect() {
+        try{
+            Class.forName("org.sqlite.JDBC");
+            connection = DriverManager.getConnection("jdbc:sqlite:C:/Users/Gul Ahmed/.codesync/localstorage.db");
+        }catch (Exception exception) {
+            System.out.println("Database connection error: " + exception.getMessage());
+        } finally {
+            // Code that will be executed regardless of whether an exception was thrown or not
+        }
+
+    }
+
+    public void disconnect() {
+        try {
+            connection.close();
+        }catch (Exception exception){
+
+        }
+    }
+
+    public void createTable(){
+        try {
+            Statement statement = connection.createStatement();
+            statement.executeUpdate(
+                    "CREATE TABLE IF NOT EXISTS user " +
+                            "(EMAIL TEXT PRIMARY KEY, " +
+                            "ACCESS_TOKEN TEXT, " +
+                            "SECRET_KEY TEXT, " +
+                            "ACCESS_KEY TEXT, " +
+                            "IS_ACTIVE INT)");
+        } catch (Exception exception) {
+            System.out.println("Table creation error!");
+        } finally {
+            // Code that will be executed regardless of whether an exception was thrown or not
+        }
+    }
+
+    public void executeUpdate(String text){
+        try {
+            Statement statement = connection.createStatement();
+            statement.executeUpdate(text);
+        } catch (Exception exception) {
+            System.out.println("While inserting: " + exception.getMessage());
+        } finally {
+            // Code that will be executed regardless of whether an exception was thrown or not
+        }
+    }
+
+    public ArrayList executeQuery (String text) {
+
+        try {
+            Statement statement = connection.createStatement();
+            ResultSet rs = statement.executeQuery(text);
+            ResultSetMetaData md = rs.getMetaData();
+
+            ArrayList<HashMap<String, String>> dataSet = new ArrayList<>();
+
+            while (rs.next()){
+                HashMap<String, String> row = new HashMap<>();
+                for(int i = 1; i <= md.getColumnCount(); i++){
+                    row.put(md.getColumnName(i), rs.getString(i));
+                }
+                dataSet.add(row);
+            }
+
+            return dataSet;
+
+        } catch (Exception exception) {
+            System.out.println("Error while getting records from database.");
+        } finally {
+            // Code that will be executed regardless of whether an exception was thrown or not
+        }
+
+        return null;
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/intellij/sdk/codesync/files/UserFile.java b/src/main/java/org/intellij/sdk/codesync/files/UserFile.java
index 6d926a52..e7836d37 100644
--- a/src/main/java/org/intellij/sdk/codesync/files/UserFile.java
+++ b/src/main/java/org/intellij/sdk/codesync/files/UserFile.java
@@ -1,5 +1,7 @@
 package org.intellij.sdk.codesync.files;
 
+import org.intellij.sdk.codesync.DataClass.UserTable;
+import org.intellij.sdk.codesync.exceptions.FileLockedError;
 import org.intellij.sdk.codesync.exceptions.FileNotCreatedError;
 import org.intellij.sdk.codesync.exceptions.InvalidYmlFileError;
 import org.intellij.sdk.codesync.utils.CommonUtils;
@@ -26,6 +28,7 @@ public User(String userEmail, Map<String, Object> userCredentials) {
             this.secretKey = (String) userCredentials.getOrDefault("secret_key", null);
             this.accessToken = (String) userCredentials.getOrDefault("access_token", null);
             this.isActive = CommonUtils.getBoolValue(userCredentials, "is_active", false);
+            UserTable.update(this);
         }
 
         /*
@@ -35,6 +38,7 @@ public User(String userEmail, String accessToken) {
             this.userEmail = userEmail;
             this.accessToken = accessToken;
             this.isActive = true;
+            UserTable.update(this);
         }
 
         /*
@@ -44,6 +48,7 @@ public User(String userEmail, String iamAccessKey, String iamSecretKey) {
             this.userEmail = userEmail;
             this.accessKey = iamAccessKey;
             this.secretKey = iamSecretKey;
+            //UserTable.update(this);
         }
 
         public String getUserEmail () {
@@ -61,6 +66,9 @@ public String getSecretKey () {
         public void makeActive () { this.isActive = true; }
         public void makeInActive () { this.isActive = false; }
 
+        public Boolean getActive() {
+            return isActive;
+        }
 
         public Map<String, Object> getYMLAsHashMap() {
             Map<String, Object> user = new HashMap<>();
@@ -78,9 +86,10 @@ public UserFile (String filePath) throws FileNotFoundException, InvalidYmlFileEr
         if (!userFile.isFile()) {
             throw new FileNotFoundException(String.format("User file \"%s\" does not exist.", filePath));
         }
-        this.userFile = userFile;
-        this.contentsMap = this.readYml();
-        this.loadYmlContent();
+        this.users = UserTable.getUsers();
+//        this.userFile = userFile;
+//        this.contentsMap = this.readYml();
+//        this.loadYmlContent();
     }
 
     /*
@@ -97,10 +106,10 @@ public UserFile (String filePath, boolean shouldCreateIfAbsent) throws FileNotFo
         } else if(!userFile.isFile()) {
             throw new FileNotFoundException(String.format("User file \"%s\" does not exist.", filePath));
         }
-
-        this.userFile = userFile;
-        this.contentsMap = this.readYml();
-        this.loadYmlContent();
+        this.users = UserTable.getUsers();
+//        this.userFile = userFile;
+//        this.contentsMap = this.readYml();
+//        this.loadYmlContent();
     }
 
     /*
@@ -171,7 +180,7 @@ private void loadYmlContent () throws InvalidYmlFileError {
                     Map<String, Object> userCredentials = (Map<String, Object>) userEntry.getValue();
                     this.users.put(userEntry.getKey(), new User(userEntry.getKey(), userCredentials));
                 }
-
+                UserTable.getUsers();
             }
         } catch (ClassCastException e){
             throw new InvalidYmlFileError(
@@ -262,4 +271,6 @@ public void setActiveUser(String userEmail, String iamAccessKey, String iamSecre
         this.users.put(userEmail, user);
     }
 
+    public void writeYml() throws FileNotFoundException, InvalidYmlFileError, FileLockedError {}
+
 }
diff --git a/src/main/main.iml b/src/main/main.iml
new file mode 100644
index 00000000..908ad4f5
--- /dev/null
+++ b/src/main/main.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/src/test/test.iml b/src/test/test.iml
new file mode 100644
index 00000000..a0e49a3b
--- /dev/null
+++ b/src/test/test.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file

From 147122f50fe101fe2d9fd1752d5d49bb39ad9f72 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed>
Date: Sun, 5 Mar 2023 21:58:22 +0500
Subject: [PATCH 02/67] Working perfectly when a user value is not null.

---
 .../sdk/codesync/DataClass/UserTable.java     | 105 +++++++------
 .../sdk/codesync/auth/AuthAction.java         |  15 +-
 .../sdk/codesync/auth/Authenticator.java      |  25 +--
 .../codesync/codeSyncSetup/CodeSyncSetup.java |   7 -
 .../intellij/sdk/codesync/files/UserFile.java | 143 ++++++------------
 5 files changed, 106 insertions(+), 189 deletions(-)

diff --git a/src/main/java/org/intellij/sdk/codesync/DataClass/UserTable.java b/src/main/java/org/intellij/sdk/codesync/DataClass/UserTable.java
index 96cb4ba5..3bac5160 100644
--- a/src/main/java/org/intellij/sdk/codesync/DataClass/UserTable.java
+++ b/src/main/java/org/intellij/sdk/codesync/DataClass/UserTable.java
@@ -5,7 +5,6 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Map;
 
 public class UserTable {
 
@@ -15,62 +14,74 @@ public class UserTable {
     static String access_key;
     static int is_active;
 
-    public static void update(UserFile.User user){
-        updateValues(user);
-        String query = "SELECT * FROM user WHERE email = '" + email + "'";
-        ArrayList<HashMap<String, String>> users = getRecords(query);
-        if(users != null && users.size() > 0){
-            query = "UPDATE user SET " +
-                    "access_token = '" + access_token +
-                    "', secret_key = '" + secret_key +
-                    "', access_key = '" + access_key +
-                    "', is_active = " + is_active +
-                    " WHERE email = '"+ email +"'";
-        }else{
-            query = "INSERT INTO user VALUES('"
-                    + email + "', '"
-                    + access_token + "', '"
-                    + secret_key + "', '"
-                    + access_key +"', '"
-                    + is_active + "')";
-        }
+    public static void insertNewUser(UserFile.User user){
+        setValues(user);
+        String query = String.format("INSERT INTO user VALUES(%s, %s, %s, %s, %d)", email, access_token, secret_key, access_key, is_active);
         Database.executeUpdate(query);
+    }
 
+    public static void updateUser(UserFile.User user){
+        setValues(user);
+        String query = String.format("UPDATE user SET access_token = %s, secret_key = %s, access_key = %s, is_active = %d WHERE email = %s", access_token, secret_key, access_key, is_active, email);
+        Database.executeUpdate(query);
     }
 
-    static void updateValues(UserFile.User user){
+    public static void updateAllUsersInActive(){
+        String query = "UPDATE user SET is_active = 0";
+        Database.executeUpdate(query);
+    }
 
-        email = user.getUserEmail() != null? user.getUserEmail() : "";
-        access_token = user.getAccessToken() != null? user.getAccessToken() : "";
-        secret_key = user.getSecretKey() != null? user.getSecretKey() : "";
-        access_key = user.getAccessKey() != null? user.getAccessKey() : "";
-        if(user.getActive() != null){
-            is_active = user.getActive()? 1 : 0;
-        }else{
-            is_active = 0;
+    public static UserFile.User getActiveUser(){
+        String query = "SELECT * FROM user WHERE is_active = 1";
+        ArrayList<HashMap<String, Object>> usersArray = Database.runQuery(query);
+
+        if(usersArray.size() > 0){
+            UserFile.User user = new UserFile.User((String) usersArray.get(0).get("EMAIL"));
+            user.setAccessKey((String) usersArray.get(0).getOrDefault("ACCESS_KEY", null));
+            user.setAccessToken((String) usersArray.get(0).getOrDefault("ACCESS_TOKEN", null));
+            user.setSecretKey((String) usersArray.get(0).getOrDefault("SECRET_KEY", null));
+            if((String) usersArray.get(0).getOrDefault("IS_ACTIVE", null) == "1"){
+                user.makeActive();
+            }else {
+                user.makeInActive();
+            }
+            return user;
         }
+
+        return null;
+
     }
 
-    public static Map<String, UserFile.User> getUsers(){
-        String query = "SELECT * FROM user";
-        Map<String, UserFile.User> users = new HashMap<>();
-        ArrayList<HashMap<String, Object>> usersArray = getRecords(query);
-        String userEmail;
-        Map<String, Object> userCredentials;
-        for(int i = 0; i < usersArray.size(); i++){
-            userCredentials = new HashMap<>();
-            userEmail = (String) usersArray.get(i).get("EMAIL");
-            userCredentials.put("access_key", usersArray.get(i).getOrDefault("ACCESS_KEY", null));
-            userCredentials.put("access_token", usersArray.get(i).getOrDefault("ACCESS_TOKEN", null));
-            userCredentials.put("secret_key", usersArray.get(i).getOrDefault("SECRET_KEY", null));
-            userCredentials.put("is_active", usersArray.get(i).getOrDefault("IS_ACTIVE", null).equals("1")? true : false);
-            UserFile.User user = new UserFile.User(userEmail, userCredentials);
-            users.put(userEmail, user);
+    public static UserFile.User getUserByEmail(String email){
+        String query = String.format("SELECT * FROM user WHERE email = '%s'", email);
+        ArrayList<HashMap<String, Object>> usersArray = Database.runQuery(query);
+
+        if(usersArray.size() > 0){
+            UserFile.User user = new UserFile.User((String) usersArray.get(0).get("EMAIL"));
+            user.setAccessKey((String) usersArray.get(0).getOrDefault("ACCESS_KEY", null));
+            user.setAccessToken((String) usersArray.get(0).getOrDefault("ACCESS_TOKEN", null));
+            user.setSecretKey((String) usersArray.get(0).getOrDefault("SECRET_KEY", null));
+            if((String) usersArray.get(0).getOrDefault("IS_ACTIVE", null) == "1"){
+                user.makeActive();
+            }else {
+                user.makeInActive();
+            }
+            return user;
         }
-        return users;
+
+        return null;
     }
-    static ArrayList getRecords(String query){
-        return Database.runQuery(query);
+
+    static void setValues(UserFile.User user){
+        email = user.getUserEmail() != null? String.format("'%s'", user.getUserEmail()) : "NULL";
+        access_token = user.getAccessToken() != null? String.format("'%s'", user.getAccessToken()) : "NULL";
+        secret_key = user.getSecretKey() != null? String.format("'%s'", user.getSecretKey()) : "NULL";
+        access_key = user.getAccessKey() != null? String.format("'%s'", user.getAccessKey()) : "NULL";
+        if(user.getActive() != null){
+            is_active = user.getActive()? 1 : 0;
+        }else{
+            is_active = 0;
+        }
     }
 
 }
diff --git a/src/main/java/org/intellij/sdk/codesync/auth/AuthAction.java b/src/main/java/org/intellij/sdk/codesync/auth/AuthAction.java
index fad9e28c..d9d37eca 100644
--- a/src/main/java/org/intellij/sdk/codesync/auth/AuthAction.java
+++ b/src/main/java/org/intellij/sdk/codesync/auth/AuthAction.java
@@ -82,21 +82,12 @@ public void actionPerformed(@NotNull AnActionEvent e) {
                     // Could not read user file.
                     return;
                 }
-                userFile.makeAllUsersInActive();
 
                 // Clear any cache that depends on user authentication status.
                 new ClearReposToIgnoreCache().execute();
-                try {
-                    userFile.writeYml();
-                } catch (FileNotFoundException | InvalidYmlFileError error) {
-                    NotificationManager.notifyError(
-                            "An error occurred trying to logout the user, please tyr again later.", project
-                    );
-                    CodeSyncLogger.error(
-                            String.format("[INTELLIJ_AUTH_ERROR]: Could write to auth file. Error: %s", error.getMessage())
-                    );
-                    return;
-                }
+
+                userFile.makeAllUsersInActive();
+
                 // Reload the state now.
                 StateUtils.reloadState(project);
 
diff --git a/src/main/java/org/intellij/sdk/codesync/auth/Authenticator.java b/src/main/java/org/intellij/sdk/codesync/auth/Authenticator.java
index 407c4106..d88730aa 100644
--- a/src/main/java/org/intellij/sdk/codesync/auth/Authenticator.java
+++ b/src/main/java/org/intellij/sdk/codesync/auth/Authenticator.java
@@ -81,23 +81,10 @@ public boolean createUser(String accessToken, String idToken){
         try {
             userFile = new UserFile(USER_FILE_PATH);
         } catch (FileNotFoundException e) {
-            if(UserFile.createFile(USER_FILE_PATH)){
-                try {
-                    userFile = new UserFile(USER_FILE_PATH);
-                } catch (FileNotFoundException | InvalidYmlFileError error) {
-                    CodeSyncLogger.error(
-                        String.format("[INTELLIJ_AUTH_ERROR]: Error opening auth file. Error: %s", error.getMessage())
-                    );
-                    // Could not open user file.
-                    return false;
-                }
-            } else {
-                // Could not create user file.
-                return false;
-            }
             CodeSyncLogger.error(
                 String.format("[INTELLIJ_AUTH_ERROR]: auth file not found. Error: %s", e.getMessage())
             );
+            return false;
         } catch (InvalidYmlFileError error) {
             error.printStackTrace();
             CodeSyncLogger.critical(
@@ -107,18 +94,10 @@ public boolean createUser(String accessToken, String idToken){
             return false;
         }
         String userEmail = claims.get("email").asString();
-        userFile.setActiveUser(userEmail, accessToken);
 
         // Clear any cache that depends on user authentication status.
         new ClearReposToIgnoreCache().execute();
-        try {
-            userFile.writeYml();
-        } catch (FileNotFoundException | InvalidYmlFileError | FileLockedError e) {
-            CodeSyncLogger.error(
-                String.format("[INTELLIJ_AUTH_ERROR]: Could not write to auth file. Error: %s", e.getMessage())
-            );
-            return false;
-        }
+        userFile.setActiveUser(userEmail, accessToken);
 
         CodeSyncLogger.debug("[INTELLIJ_AUTH]: User completed login flow.");
         return true;
diff --git a/src/main/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetup.java b/src/main/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetup.java
index b4c79cbe..32d251dd 100644
--- a/src/main/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetup.java
+++ b/src/main/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetup.java
@@ -675,13 +675,6 @@ public static void saveIamUser(String email, String iamAccessKey, String iamSecr
         }
 
         userFile.setActiveUser(email, iamAccessKey, iamSecretKey);
-        try {
-            userFile.writeYml();
-        } catch (FileNotFoundException | InvalidYmlFileError | FileLockedError error) {
-            CodeSyncLogger.critical(
-                    String.format("[INTELLI_REPO_INIT_ERROR]: Could not write to user auth file. Error %s", error.getMessage())
-            );
-        }
     }
 
     public static void saveFileIds(
diff --git a/src/main/java/org/intellij/sdk/codesync/files/UserFile.java b/src/main/java/org/intellij/sdk/codesync/files/UserFile.java
index e7836d37..375817d0 100644
--- a/src/main/java/org/intellij/sdk/codesync/files/UserFile.java
+++ b/src/main/java/org/intellij/sdk/codesync/files/UserFile.java
@@ -1,34 +1,22 @@
 package org.intellij.sdk.codesync.files;
 
 import org.intellij.sdk.codesync.DataClass.UserTable;
-import org.intellij.sdk.codesync.exceptions.FileLockedError;
 import org.intellij.sdk.codesync.exceptions.FileNotCreatedError;
 import org.intellij.sdk.codesync.exceptions.InvalidYmlFileError;
-import org.intellij.sdk.codesync.utils.CommonUtils;
 
 import java.io.*;
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.intellij.sdk.codesync.Constants.USER_FILE_PATH;
+public class UserFile{
 
 
-public class UserFile extends CodeSyncYmlFile {
-    File userFile;
-    public Map<String, Object> contentsMap;
-    public Map<String, User> users = new HashMap<>();
-
     public static class User {
         String userEmail, accessKey = null, secretKey = null, accessToken = null;
         Boolean isActive = false;
 
-        public User(String userEmail, Map<String, Object> userCredentials) {
+        public User(String userEmail) {
             this.userEmail = userEmail;
-            this.accessKey = (String) userCredentials.getOrDefault("access_key", null);
-            this.secretKey = (String) userCredentials.getOrDefault("secret_key", null);
-            this.accessToken = (String) userCredentials.getOrDefault("access_token", null);
-            this.isActive = CommonUtils.getBoolValue(userCredentials, "is_active", false);
-            UserTable.update(this);
         }
 
         /*
@@ -38,7 +26,6 @@ public User(String userEmail, String accessToken) {
             this.userEmail = userEmail;
             this.accessToken = accessToken;
             this.isActive = true;
-            UserTable.update(this);
         }
 
         /*
@@ -48,7 +35,6 @@ public User(String userEmail, String iamAccessKey, String iamSecretKey) {
             this.userEmail = userEmail;
             this.accessKey = iamAccessKey;
             this.secretKey = iamSecretKey;
-            //UserTable.update(this);
         }
 
         public String getUserEmail () {
@@ -80,36 +66,17 @@ public Map<String, Object> getYMLAsHashMap() {
         }
     }
 
-    public UserFile (String filePath) throws FileNotFoundException, InvalidYmlFileError {
-        File userFile = new File(filePath);
-
-        if (!userFile.isFile()) {
-            throw new FileNotFoundException(String.format("User file \"%s\" does not exist.", filePath));
-        }
-        this.users = UserTable.getUsers();
-//        this.userFile = userFile;
-//        this.contentsMap = this.readYml();
-//        this.loadYmlContent();
+    public UserFile (String filePath) throws FileNotFoundException, InvalidYmlFileError{
+        //UserFile constructor 1
+        System.out.println("UserFile constructor 1: " + filePath);
     }
 
     /*
     Instantiate a user file, create the file if it does not exist.
      */
-    public UserFile (String filePath, boolean shouldCreateIfAbsent) throws FileNotFoundException, FileNotCreatedError, InvalidYmlFileError {
-        File userFile = new File(filePath);
-
-        if (!userFile.isFile() && shouldCreateIfAbsent) {
-            boolean isFileReady = createFile(filePath);
-            if (!isFileReady) {
-                throw new FileNotCreatedError(String.format("User file \"%s\" could not be created.", filePath));
-            }
-        } else if(!userFile.isFile()) {
-            throw new FileNotFoundException(String.format("User file \"%s\" does not exist.", filePath));
-        }
-        this.users = UserTable.getUsers();
-//        this.userFile = userFile;
-//        this.contentsMap = this.readYml();
-//        this.loadYmlContent();
+    public UserFile (String filePath, boolean shouldCreateIfAbsent)throws FileNotFoundException, FileNotCreatedError, InvalidYmlFileError{
+        //UserFile constructor 2
+        System.out.println("UserFile constructor 2: " + filePath + " " + shouldCreateIfAbsent);
     }
 
     /*
@@ -119,12 +86,17 @@ public UserFile (String filePath, boolean shouldCreateIfAbsent) throws FileNotFo
     access token will be present.
      */
     public static String getAccessToken(String email) {
+
         UserFile userFile;
-        try {
-            userFile = new UserFile(USER_FILE_PATH);
-        } catch (FileNotFoundException | InvalidYmlFileError e) {
-            return null;
+
+        try{
+            userFile = new UserFile("FakePath");
+        } catch (InvalidYmlFileError e) {
+            throw new RuntimeException(e);
+        } catch (FileNotFoundException e) {
+            throw new RuntimeException(e);
         }
+
         UserFile.User user = email == null ? userFile.getActiveUser(): userFile.getActiveUser(email);
         if (user != null) {
             return user.getAccessToken();
@@ -138,10 +110,13 @@ public static String getAccessToken(String email) {
      */
     public static String getEmail() {
         UserFile userFile;
-        try {
-            userFile = new UserFile(USER_FILE_PATH);
-        } catch (FileNotFoundException | InvalidYmlFileError e) {
-            return null;
+
+        try{
+            userFile = new UserFile("FakePath");
+        } catch (InvalidYmlFileError e) {
+            throw new RuntimeException(e);
+        } catch (FileNotFoundException e) {
+            throw new RuntimeException(e);
         }
 
         UserFile.User user =  userFile.getActiveUser();
@@ -158,42 +133,11 @@ public static String getAccessToken() {
         return getAccessToken(null);
     }
 
-    public File getYmlFile()  {
-        return this.userFile;
-    }
-
-    public Map<String, Object> getYMLAsHashMap() {
-        Map<String, Object> contents = new HashMap<>();
-        for (User user: this.users.values()) {
-            contents.put(user.getUserEmail(), user.getYMLAsHashMap());
-        }
-        return contents;
-    }
-
-    private void loadYmlContent () throws InvalidYmlFileError {
-        if (this.contentsMap == null) {
-            return;
-        }
-        try {
-            for (Map.Entry<String, Object> userEntry : this.contentsMap.entrySet()) {
-                if (userEntry.getValue() != null) {
-                    Map<String, Object> userCredentials = (Map<String, Object>) userEntry.getValue();
-                    this.users.put(userEntry.getKey(), new User(userEntry.getKey(), userCredentials));
-                }
-                UserTable.getUsers();
-            }
-        } catch (ClassCastException e){
-            throw new InvalidYmlFileError(
-                String.format("User yml file \"%s\" is not valid. Error: %s", this.getYmlFile().getPath(), e.getMessage())
-            );
-        }
-    }
-
     /*
     Get the user matching the given email.
      */
     public User getUser(String userEmail) {
-        return this.users.getOrDefault(userEmail, null);
+        return UserTable.getUserByEmail(userEmail);
     }
 
     /*
@@ -212,19 +156,17 @@ public String getActiveAccessToken() {
      */
     public User getActiveUser(String email) {
         User user = getUser(email);
-        return user.isActive ? user: null;
+        if(user != null){
+            return user.isActive ? user: null;
+        }
+        return null;
     }
 
     /*
     Get the active user from the map.
      */
     public User getActiveUser() {
-        for (User user: this.users.values()) {
-            if (user.isActive) {
-                return user;
-            }
-        }
-        return null;
+        return UserTable.getActiveUser();
     }
 
     /*
@@ -237,24 +179,26 @@ public void setActiveUser(String userEmail, String accessToken) {
         User user = getUser(userEmail);
         if (user == null) {
             user = new User(userEmail, accessToken);
+            // First mark all users in-active.
+            this.makeAllUsersInActive();
+            // Now mark the new user active.
+            user.makeActive();
+            UserTable.insertNewUser(user);
         } else {
             user.setAccessToken(accessToken);
+            // First mark all users in-active.
+            this.makeAllUsersInActive();
+            // Now mark the new user active.
+            user.makeActive();
+            UserTable.updateUser(user);
         }
-        // First mark all users in-active.
-        this.makeAllUsersInActive();
-
-        // Now mark the new user active.
-        user.makeActive();
-        this.users.put(userEmail, user);
     }
 
     /*
     Make all user's in-active by setting `is_active` to false.
      */
     public void makeAllUsersInActive() {
-        for (User user: this.users.values()) {
-            user.makeInActive();
-        }
+        UserTable.updateAllUsersInActive();
     }
 
     /*
@@ -264,13 +208,12 @@ public void setActiveUser(String userEmail, String iamAccessKey, String iamSecre
         User user = getUser(userEmail);
         if (user == null) {
             user = new User(userEmail, iamAccessKey, iamSecretKey);
+            UserTable.insertNewUser(user);
         } else {
             user.setAccessKey(iamAccessKey);
             user.setSecretKey(iamSecretKey);
+            UserTable.updateUser(user);
         }
-        this.users.put(userEmail, user);
     }
 
-    public void writeYml() throws FileNotFoundException, InvalidYmlFileError, FileLockedError {}
-
 }

From 5cd51211998b3d16cec74f6d33a34c323855dffc Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed>
Date: Tue, 7 Mar 2023 03:40:00 +0500
Subject: [PATCH 03/67] Refactoring code 1

---
 .../org/intellij/sdk/codesync/Database.java   | 66 ++++++++++++--
 .../java/org/intellij/sdk/codesync/db.java    | 90 -------------------
 .../intellij/sdk/codesync/files/UserFile.java | 12 +--
 3 files changed, 58 insertions(+), 110 deletions(-)
 delete mode 100644 src/main/java/org/intellij/sdk/codesync/db.java

diff --git a/src/main/java/org/intellij/sdk/codesync/Database.java b/src/main/java/org/intellij/sdk/codesync/Database.java
index 8f16ebda..eb1d6264 100644
--- a/src/main/java/org/intellij/sdk/codesync/Database.java
+++ b/src/main/java/org/intellij/sdk/codesync/Database.java
@@ -1,30 +1,78 @@
 package org.intellij.sdk.codesync;
 
-import org.bouncycastle.jcajce.provider.digest.MD2;
-
+import java.sql.*;
 import java.util.ArrayList;
 import java.util.HashMap;
 
+import static org.intellij.sdk.codesync.Constants.CODESYNC_ROOT;
+
 public class Database {
 
-    public static db instance;
+    private static Connection connection = null;
 
     public static void initiate() {
-
-        instance = new db();
-        instance.connect();
+        try{
+            Class.forName("org.sqlite.JDBC");
+            String connectionString = "jdbc:sqlite:" + CODESYNC_ROOT + "\\localstorage.db";
+            connection = DriverManager.getConnection(connectionString);
+        }catch (Exception exception) {
+            System.out.println("Database connection error: " + exception.getMessage());
+        }
     }
 
     public static ArrayList runQuery(String query){
-        return instance.executeQuery(query);
+        try {
+            Statement statement = connection.createStatement();
+            ResultSet rs = statement.executeQuery(query);
+            ResultSetMetaData md = rs.getMetaData();
+
+            ArrayList<HashMap<String, String>> dataSet = new ArrayList<>();
+
+            while (rs.next()){
+                HashMap<String, String> row = new HashMap<>();
+                for(int i = 1; i <= md.getColumnCount(); i++){
+                    row.put(md.getColumnName(i), rs.getString(i));
+                }
+                dataSet.add(row);
+            }
+
+            return dataSet;
+
+        } catch (Exception exception) {
+            System.out.println("Error while getting records from database.");
+        }
+
+        return null;
     }
 
     public static void executeUpdate(String query){
-        instance.executeUpdate(query);
+        try {
+            Statement statement = connection.createStatement();
+            statement.executeUpdate(query);
+        } catch (Exception exception) {
+            System.out.println("While inserting: " + exception.getMessage());
+        }
+    }
+
+    public static void queryTest(){
+//        try {
+//            Statement statement = connection.createStatement();
+//            ResultSet rs = statement.executeQuery("SELECT * FROM user WHERE email = 'gulahmed@codesync.com'");
+//
+//            while (rs.next()){
+//                System.out.println("Testing!!!! : " + rs.getString(3));
+//            }
+//        } catch (Exception exception) {
+//            System.out.println("Error while getting records from database.");
+//        }
     }
 
     public static void disconnect(){
-        instance.disconnect();
+        try {
+            connection.close();
+        }catch (Exception exception){
+            System.out.println("Error while disconnecting database: " + exception.getMessage());
+        }
     }
 
 }
diff --git a/src/main/java/org/intellij/sdk/codesync/db.java b/src/main/java/org/intellij/sdk/codesync/db.java
deleted file mode 100644
index 71fe8b6a..00000000
--- a/src/main/java/org/intellij/sdk/codesync/db.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.intellij.sdk.codesync;
-
-import com.intellij.vcs.log.Hash;
-
-import java.sql.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-
-class db {
-    private Connection connection = null;
-
-    public void connect() {
-        try{
-            Class.forName("org.sqlite.JDBC");
-            connection = DriverManager.getConnection("jdbc:sqlite:C:/Users/Gul Ahmed/.codesync/localstorage.db");
-        }catch (Exception exception) {
-            System.out.println("Database connection error: " + exception.getMessage());
-        } finally {
-            // Code that will be executed regardless of whether an exception was thrown or not
-        }
-
-    }
-
-    public void disconnect() {
-        try {
-            connection.close();
-        }catch (Exception exception){
-
-        }
-    }
-
-    public void createTable(){
-        try {
-            Statement statement = connection.createStatement();
-            statement.executeUpdate(
-                    "CREATE TABLE IF NOT EXISTS user " +
-                            "(EMAIL TEXT PRIMARY KEY, " +
-                            "ACCESS_TOKEN TEXT, " +
-                            "SECRET_KEY TEXT, " +
-                            "ACCESS_KEY TEXT, " +
-                            "IS_ACTIVE INT)");
-        } catch (Exception exception) {
-            System.out.println("Table creation error!");
-        } finally {
-            // Code that will be executed regardless of whether an exception was thrown or not
-        }
-    }
-
-    public void executeUpdate(String text){
-        try {
-            Statement statement = connection.createStatement();
-            statement.executeUpdate(text);
-        } catch (Exception exception) {
-            System.out.println("While inserting: " + exception.getMessage());
-        } finally {
-            // Code that will be executed regardless of whether an exception was thrown or not
-        }
-    }
-
-    public ArrayList executeQuery (String text) {
-
-        try {
-            Statement statement = connection.createStatement();
-            ResultSet rs = statement.executeQuery(text);
-            ResultSetMetaData md = rs.getMetaData();
-
-            ArrayList<HashMap<String, String>> dataSet = new ArrayList<>();
-
-            while (rs.next()){
-                HashMap<String, String> row = new HashMap<>();
-                for(int i = 1; i <= md.getColumnCount(); i++){
-                    row.put(md.getColumnName(i), rs.getString(i));
-                }
-                dataSet.add(row);
-            }
-
-            return dataSet;
-
-        } catch (Exception exception) {
-            System.out.println("Error while getting records from database.");
-        } finally {
-            // Code that will be executed regardless of whether an exception was thrown or not
-        }
-
-        return null;
-    }
-
-
-}
\ No newline at end of file
diff --git a/src/main/java/org/intellij/sdk/codesync/files/UserFile.java b/src/main/java/org/intellij/sdk/codesync/files/UserFile.java
index 375817d0..a2a14663 100644
--- a/src/main/java/org/intellij/sdk/codesync/files/UserFile.java
+++ b/src/main/java/org/intellij/sdk/codesync/files/UserFile.java
@@ -5,13 +5,12 @@
 import org.intellij.sdk.codesync.exceptions.InvalidYmlFileError;
 
 import java.io.*;
-import java.util.HashMap;
-import java.util.Map;
 
 public class UserFile{
 
 
     public static class User {
+        //New chagnes
         String userEmail, accessKey = null, secretKey = null, accessToken = null;
         Boolean isActive = false;
 
@@ -55,15 +54,6 @@ public String getSecretKey () {
         public Boolean getActive() {
             return isActive;
         }
-
-        public Map<String, Object> getYMLAsHashMap() {
-            Map<String, Object> user = new HashMap<>();
-            user.put("access_key", this.accessKey);
-            user.put("secret_key", this.secretKey);
-            user.put("access_token", this.accessToken);
-            user.put("is_active", this.isActive);
-            return user;
-        }
     }
 
     public UserFile (String filePath) throws FileNotFoundException, InvalidYmlFileError{

From 1e2818ab4947cb02f8ab1476e98a96fea724a136 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed>
Date: Tue, 7 Mar 2023 04:21:01 +0500
Subject: [PATCH 04/67] Can create database and user table on new system.

---
 .../java/org/intellij/sdk/codesync/Database.java | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/main/java/org/intellij/sdk/codesync/Database.java b/src/main/java/org/intellij/sdk/codesync/Database.java
index eb1d6264..77d07b27 100644
--- a/src/main/java/org/intellij/sdk/codesync/Database.java
+++ b/src/main/java/org/intellij/sdk/codesync/Database.java
@@ -15,11 +15,27 @@ public static void initiate() {
             Class.forName("org.sqlite.JDBC");
             String connectionString = "jdbc:sqlite:" + CODESYNC_ROOT + "\\localstorage.db";
             connection = DriverManager.getConnection(connectionString);
+            createTable();
         }catch (Exception exception) {
             System.out.println("Database connection error: " + exception.getMessage());
         }
     }
 
+    public static void createTable(){
+        try {
+            Statement statement = connection.createStatement();
+            statement.executeUpdate(
+                    "CREATE TABLE IF NOT EXISTS user " +
+                            "(EMAIL TEXT PRIMARY KEY, " +
+                            "ACCESS_TOKEN TEXT, " +
+                            "SECRET_KEY TEXT, " +
+                            "ACCESS_KEY TEXT, " +
+                            "IS_ACTIVE INT)");
+        } catch (Exception exception) {
+            System.out.println("Table creation error!");
+        }
+    }
+
     public static ArrayList runQuery(String query){
         try {
             Statement statement = connection.createStatement();

From 8c78a4340712f6afe613bbd0b6846424bc6f3b58 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed>
Date: Tue, 7 Mar 2023 17:20:14 +0500
Subject: [PATCH 05/67] Automated process of transforming user file to user
 table if does not exist

---
 .../codesync/DataClass/TransformFileToDB.java | 68 +++++++++++++++++++
 .../org/intellij/sdk/codesync/Database.java   | 25 +++++--
 .../intellij/sdk/codesync/files/UserFile.java | 10 +++
 3 files changed, 99 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/org/intellij/sdk/codesync/DataClass/TransformFileToDB.java

diff --git a/src/main/java/org/intellij/sdk/codesync/DataClass/TransformFileToDB.java b/src/main/java/org/intellij/sdk/codesync/DataClass/TransformFileToDB.java
new file mode 100644
index 00000000..d52f9851
--- /dev/null
+++ b/src/main/java/org/intellij/sdk/codesync/DataClass/TransformFileToDB.java
@@ -0,0 +1,68 @@
+package org.intellij.sdk.codesync.DataClass;
+
+import com.google.common.io.CharStreams;
+import org.intellij.sdk.codesync.Database;
+import org.intellij.sdk.codesync.exceptions.InvalidYmlFileError;
+import org.intellij.sdk.codesync.files.UserFile;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.error.YAMLException;
+
+import java.io.*;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.intellij.sdk.codesync.Constants.USER_FILE_PATH;
+public class TransformFileToDB {
+
+    File userFile = new File(USER_FILE_PATH);
+    public Map<String, Object> contentsMap;
+    public Map<String, UserFile.User> users = new HashMap<>();
+
+    private void readYml() throws FileNotFoundException, InvalidYmlFileError {
+        Yaml yaml = new Yaml();
+        InputStream inputStream;
+        inputStream = new FileInputStream(userFile);
+        String text = null;
+
+        try (Reader reader = new InputStreamReader(inputStream)) {
+            text = CharStreams.toString(reader);
+            this.contentsMap = yaml.load(text);
+        } catch (IOException | YAMLException e) {
+            throw new InvalidYmlFileError(e.getMessage());
+        }
+    }
+
+    private void loadYmlContent () throws InvalidYmlFileError {
+        if (this.contentsMap == null) {
+            return;
+        }
+        try {
+            for (Map.Entry<String, Object> userEntry : this.contentsMap.entrySet()) {
+                if (userEntry.getValue() != null) {
+                    Map<String, Object> userCredentials = (Map<String, Object>) userEntry.getValue();
+                    this.users.put(userEntry.getKey(), new UserFile.User(userEntry.getKey(), userCredentials));
+                }
+            }
+        } catch (ClassCastException e){
+            throw new InvalidYmlFileError(
+                    String.format("User yml file \"%s\" is not valid. Error: %s", this.userFile.getPath(), e.getMessage())
+            );
+        }
+    }
+
+    public void readUsersInFile(){
+        try{
+            readYml();
+            loadYmlContent();
+            for(String key : users.keySet()){
+                UserTable.insertNewUser(users.get(key));
+            }
+        } catch (InvalidYmlFileError e) {
+            throw new RuntimeException(e);
+        } catch (FileNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+}
diff --git a/src/main/java/org/intellij/sdk/codesync/Database.java b/src/main/java/org/intellij/sdk/codesync/Database.java
index 77d07b27..7776ebd8 100644
--- a/src/main/java/org/intellij/sdk/codesync/Database.java
+++ b/src/main/java/org/intellij/sdk/codesync/Database.java
@@ -1,5 +1,8 @@
 package org.intellij.sdk.codesync;
 
+import org.intellij.sdk.codesync.DataClass.TransformFileToDB;
+
+import java.io.File;
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -11,11 +14,25 @@ public class Database {
     private static Connection connection = null;
 
     public static void initiate() {
+
         try{
-            Class.forName("org.sqlite.JDBC");
-            String connectionString = "jdbc:sqlite:" + CODESYNC_ROOT + "\\localstorage.db";
-            connection = DriverManager.getConnection(connectionString);
-            createTable();
+
+            String filePath = CODESYNC_ROOT + "\\localstorage.db";
+            File file = new File(filePath);
+            if(!file.exists()){
+                Class.forName("org.sqlite.JDBC");
+                String connectionString = "jdbc:sqlite:" + filePath;
+                connection = DriverManager.getConnection(connectionString);
+                createTable();
+                TransformFileToDB transformFileToDB = new TransformFileToDB();
+                transformFileToDB.readUsersInFile();
+            }else {
+                Class.forName("org.sqlite.JDBC");
+                String connectionString = "jdbc:sqlite:" + filePath;
+                connection = DriverManager.getConnection(connectionString);
+                createTable();
+            }
+
         }catch (Exception exception) {
             System.out.println("Database connection error: " + exception.getMessage());
         }
diff --git a/src/main/java/org/intellij/sdk/codesync/files/UserFile.java b/src/main/java/org/intellij/sdk/codesync/files/UserFile.java
index a2a14663..5be458b2 100644
--- a/src/main/java/org/intellij/sdk/codesync/files/UserFile.java
+++ b/src/main/java/org/intellij/sdk/codesync/files/UserFile.java
@@ -3,8 +3,10 @@
 import org.intellij.sdk.codesync.DataClass.UserTable;
 import org.intellij.sdk.codesync.exceptions.FileNotCreatedError;
 import org.intellij.sdk.codesync.exceptions.InvalidYmlFileError;
+import org.intellij.sdk.codesync.utils.CommonUtils;
 
 import java.io.*;
+import java.util.Map;
 
 public class UserFile{
 
@@ -14,6 +16,14 @@ public static class User {
         String userEmail, accessKey = null, secretKey = null, accessToken = null;
         Boolean isActive = false;
 
+        public User(String userEmail, Map<String, Object> userCredentials) {
+            this.userEmail = userEmail;
+            this.accessKey = (String) userCredentials.getOrDefault("access_key", null);
+            this.secretKey = (String) userCredentials.getOrDefault("secret_key", null);
+            this.accessToken = (String) userCredentials.getOrDefault("access_token", null);
+            this.isActive = CommonUtils.getBoolValue(userCredentials, "is_active", false);
+        }
+
         public User(String userEmail) {
             this.userEmail = userEmail;
         }

From e336f69df1f8cf8eb28886171c73d9c192c7f86c Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed>
Date: Tue, 7 Mar 2023 17:50:42 +0500
Subject: [PATCH 06/67] Setting db path variable

---
 src/main/java/org/intellij/sdk/codesync/Constants.java |  5 ++++-
 src/main/java/org/intellij/sdk/codesync/Database.java  | 10 ++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/intellij/sdk/codesync/Constants.java b/src/main/java/org/intellij/sdk/codesync/Constants.java
index ba889edc..44b4170e 100644
--- a/src/main/java/org/intellij/sdk/codesync/Constants.java
+++ b/src/main/java/org/intellij/sdk/codesync/Constants.java
@@ -32,7 +32,10 @@ private Constants() {
     public static final String DELETED_REPO = Paths.get(CODESYNC_ROOT, ".deleted").toString();
     public static final String SHADOW_REPO = Paths.get(CODESYNC_ROOT, ".shadow").toString();
     public static final String CONFIG_PATH = Paths.get(CODESYNC_ROOT, "config.yml").toString();
-    public static final String USER_FILE_PATH = Paths.get(CODESYNC_ROOT, "user.yml").toString();
+
+    //TODO: User file will be removed
+    public static final String USER_FILE_PATH = Paths.get(CODESYNC_ROOT, "codesyncdb.db").toString();
+    public static final String DATABASE_FILE_LOCATION = Paths.get(CODESYNC_ROOT, "").toString();
     public static final String ALERTS_FILE_PATH = Paths.get(CODESYNC_ROOT, "alerts.yml").toString();
     public static final String SEQUENCE_TOKEN_FILE_PATH = Paths.get(CODESYNC_ROOT, "sequence_token.yml").toString();
     public static final String DEFAULT_BRANCH = "default";
diff --git a/src/main/java/org/intellij/sdk/codesync/Database.java b/src/main/java/org/intellij/sdk/codesync/Database.java
index 7776ebd8..90033449 100644
--- a/src/main/java/org/intellij/sdk/codesync/Database.java
+++ b/src/main/java/org/intellij/sdk/codesync/Database.java
@@ -7,7 +7,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import static org.intellij.sdk.codesync.Constants.CODESYNC_ROOT;
+import static org.intellij.sdk.codesync.Constants.USER_FILE_PATH;
 
 public class Database {
 
@@ -16,19 +16,17 @@ public class Database {
     public static void initiate() {
 
         try{
-
-            String filePath = CODESYNC_ROOT + "\\localstorage.db";
-            File file = new File(filePath);
+            File file = new File(USER_FILE_PATH);
             if(!file.exists()){
                 Class.forName("org.sqlite.JDBC");
-                String connectionString = "jdbc:sqlite:" + filePath;
+                String connectionString = "jdbc:sqlite:" + USER_FILE_PATH;
                 connection = DriverManager.getConnection(connectionString);
                 createTable();
                 TransformFileToDB transformFileToDB = new TransformFileToDB();
                 transformFileToDB.readUsersInFile();
             }else {
                 Class.forName("org.sqlite.JDBC");
-                String connectionString = "jdbc:sqlite:" + filePath;
+                String connectionString = "jdbc:sqlite:" + USER_FILE_PATH;
                 connection = DriverManager.getConnection(connectionString);
                 createTable();
             }

From 65d61cd5f80f72df48d56784ee64d58cc6a87d0b Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed>
Date: Tue, 7 Mar 2023 18:25:00 +0500
Subject: [PATCH 07/67] Fix db path

---
 src/main/java/org/intellij/sdk/codesync/Constants.java | 4 ++--
 src/main/java/org/intellij/sdk/codesync/Database.java  | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/intellij/sdk/codesync/Constants.java b/src/main/java/org/intellij/sdk/codesync/Constants.java
index 44b4170e..f3ec9db7 100644
--- a/src/main/java/org/intellij/sdk/codesync/Constants.java
+++ b/src/main/java/org/intellij/sdk/codesync/Constants.java
@@ -34,8 +34,8 @@ private Constants() {
     public static final String CONFIG_PATH = Paths.get(CODESYNC_ROOT, "config.yml").toString();
 
     //TODO: User file will be removed
-    public static final String USER_FILE_PATH = Paths.get(CODESYNC_ROOT, "codesyncdb.db").toString();
-    public static final String DATABASE_FILE_LOCATION = Paths.get(CODESYNC_ROOT, "").toString();
+    public static final String USER_FILE_PATH = Paths.get(CODESYNC_ROOT, "user.yml").toString();
+    public static final String DATABASE_PATH = Paths.get(CODESYNC_ROOT, "codesyncdb.db").toString();
     public static final String ALERTS_FILE_PATH = Paths.get(CODESYNC_ROOT, "alerts.yml").toString();
     public static final String SEQUENCE_TOKEN_FILE_PATH = Paths.get(CODESYNC_ROOT, "sequence_token.yml").toString();
     public static final String DEFAULT_BRANCH = "default";
diff --git a/src/main/java/org/intellij/sdk/codesync/Database.java b/src/main/java/org/intellij/sdk/codesync/Database.java
index 90033449..de9287f8 100644
--- a/src/main/java/org/intellij/sdk/codesync/Database.java
+++ b/src/main/java/org/intellij/sdk/codesync/Database.java
@@ -7,6 +7,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 
+import static org.intellij.sdk.codesync.Constants.DATABASE_PATH;
 import static org.intellij.sdk.codesync.Constants.USER_FILE_PATH;
 
 public class Database {
@@ -16,17 +17,17 @@ public class Database {
     public static void initiate() {
 
         try{
-            File file = new File(USER_FILE_PATH);
+            File file = new File(DATABASE_PATH);
             if(!file.exists()){
                 Class.forName("org.sqlite.JDBC");
-                String connectionString = "jdbc:sqlite:" + USER_FILE_PATH;
+                String connectionString = "jdbc:sqlite:" + DATABASE_PATH;
                 connection = DriverManager.getConnection(connectionString);
                 createTable();
                 TransformFileToDB transformFileToDB = new TransformFileToDB();
                 transformFileToDB.readUsersInFile();
             }else {
                 Class.forName("org.sqlite.JDBC");
-                String connectionString = "jdbc:sqlite:" + USER_FILE_PATH;
+                String connectionString = "jdbc:sqlite:" + DATABASE_PATH;
                 connection = DriverManager.getConnection(connectionString);
                 createTable();
             }

From 14c61f3e497153c43ee93f65ff1c781dda7c64cd Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 8 Mar 2023 01:01:47 +0500
Subject: [PATCH 08/67] Feedback by Basit implemented except for UserFile class

---
 .run/Run [runIde].run.xml                     |  2 +-
 .../codesync-intellij [publishPlugin].run.xml | 28 ----------
 .../org/intellij/sdk/codesync/Constants.java  |  6 +-
 .../org/intellij/sdk/codesync/Database.java   | 55 ++++++-------------
 .../codesync/ProjectOpenCloseListener.java    |  2 -
 .../codesync/codeSyncSetup/CodeSyncSetup.java |  2 +
 .../{DataClass => database}/UserTable.java    |  4 +-
 .../migrations/MigrateUser.java}              |  8 +--
 .../intellij/sdk/codesync/files/UserFile.java |  4 +-
 src/main/main.iml                             | 11 ----
 src/test/test.iml                             | 11 ----
 11 files changed, 33 insertions(+), 100 deletions(-)
 delete mode 100644 .run/codesync-intellij [publishPlugin].run.xml
 rename src/main/java/org/intellij/sdk/codesync/{DataClass => database}/UserTable.java (96%)
 rename src/main/java/org/intellij/sdk/codesync/{DataClass/TransformFileToDB.java => database/migrations/MigrateUser.java} (92%)
 delete mode 100644 src/main/main.iml
 delete mode 100644 src/test/test.iml

diff --git a/.run/Run [runIde].run.xml b/.run/Run [runIde].run.xml
index 683b70fd..e29b640a 100644
--- a/.run/Run [runIde].run.xml	
+++ b/.run/Run [runIde].run.xml	
@@ -3,7 +3,7 @@
     <ExternalSystemSettings>
       <option name="env">
         <map>
-          <entry key="env" value="prod" />
+          <entry key="env" value="dev" />
         </map>
       </option>
       <option name="executionName" />
diff --git a/.run/codesync-intellij [publishPlugin].run.xml b/.run/codesync-intellij [publishPlugin].run.xml
deleted file mode 100644
index 1290b521..00000000
--- a/.run/codesync-intellij [publishPlugin].run.xml	
+++ /dev/null
@@ -1,28 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="3- codesync-intellij [publishPlugin]" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="env">
-        <map>
-          <entry key="ORG_GRADLE_PROJECT_intellijPublishToken" value="perm:{add-key-here}" />
-        </map>
-      </option>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="publishPlugin" />
-        </list>
-      </option>
-      <option name="vmOptions" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/src/main/java/org/intellij/sdk/codesync/Constants.java b/src/main/java/org/intellij/sdk/codesync/Constants.java
index f3ec9db7..b68a1921 100644
--- a/src/main/java/org/intellij/sdk/codesync/Constants.java
+++ b/src/main/java/org/intellij/sdk/codesync/Constants.java
@@ -35,7 +35,6 @@ private Constants() {
 
     //TODO: User file will be removed
     public static final String USER_FILE_PATH = Paths.get(CODESYNC_ROOT, "user.yml").toString();
-    public static final String DATABASE_PATH = Paths.get(CODESYNC_ROOT, "codesyncdb.db").toString();
     public static final String ALERTS_FILE_PATH = Paths.get(CODESYNC_ROOT, "alerts.yml").toString();
     public static final String SEQUENCE_TOKEN_FILE_PATH = Paths.get(CODESYNC_ROOT, "sequence_token.yml").toString();
     public static final String DEFAULT_BRANCH = "default";
@@ -48,6 +47,11 @@ private Constants() {
     public static final Integer DELAY_BETWEEN_ACTIVITY_ALERT_TASKS = 10 * 60 * 1000; // 10 minutes wait.
     public static final Integer DELAY_BETWEEN_BUFFER_TASKS_IN_SECONDS = 5;
 
+    //Database queries and strings
+    public static final String DATABASE_PATH = Paths.get(CODESYNC_ROOT, "codesyncdb.db").toString();
+    public static final String CONNECTION_STRING = "jdbc:sqlite:" + DATABASE_PATH;
+    public static final String CREATE_USER_TABLE_QUERY = "CREATE TABLE IF NOT EXISTS user (EMAIL TEXT PRIMARY KEY, ACCESS_TOKEN TEXT, SECRET_KEY TEXT, ACCESS_KEY TEXT, IS_ACTIVE INT)";
+
     public static final String DEFAULT_TIMEZONE = ZoneId.systemDefault().getId();
     public static final String DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS z";
     public static final String DATE_FORMAT = "yyyy-MM-dd";
diff --git a/src/main/java/org/intellij/sdk/codesync/Database.java b/src/main/java/org/intellij/sdk/codesync/Database.java
index de9287f8..91d6c9ef 100644
--- a/src/main/java/org/intellij/sdk/codesync/Database.java
+++ b/src/main/java/org/intellij/sdk/codesync/Database.java
@@ -1,14 +1,13 @@
 package org.intellij.sdk.codesync;
 
-import org.intellij.sdk.codesync.DataClass.TransformFileToDB;
+import org.intellij.sdk.codesync.database.migrations.MigrateUser;
 
 import java.io.File;
 import java.sql.*;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import static org.intellij.sdk.codesync.Constants.DATABASE_PATH;
-import static org.intellij.sdk.codesync.Constants.USER_FILE_PATH;
+import static org.intellij.sdk.codesync.Constants.*;
 
 public class Database {
 
@@ -20,16 +19,16 @@ public static void initiate() {
             File file = new File(DATABASE_PATH);
             if(!file.exists()){
                 Class.forName("org.sqlite.JDBC");
-                String connectionString = "jdbc:sqlite:" + DATABASE_PATH;
+                String connectionString = CONNECTION_STRING;
                 connection = DriverManager.getConnection(connectionString);
-                createTable();
-                TransformFileToDB transformFileToDB = new TransformFileToDB();
-                transformFileToDB.readUsersInFile();
+                executeUpdate(CREATE_USER_TABLE_QUERY);
+                MigrateUser migrateUser = new MigrateUser();
+                migrateUser.migrateData();
             }else {
                 Class.forName("org.sqlite.JDBC");
-                String connectionString = "jdbc:sqlite:" + DATABASE_PATH;
+                String connectionString = CONNECTION_STRING;
                 connection = DriverManager.getConnection(connectionString);
-                createTable();
+                executeUpdate(CREATE_USER_TABLE_QUERY);
             }
 
         }catch (Exception exception) {
@@ -37,21 +36,14 @@ public static void initiate() {
         }
     }
 
-    public static void createTable(){
-        try {
-            Statement statement = connection.createStatement();
-            statement.executeUpdate(
-                    "CREATE TABLE IF NOT EXISTS user " +
-                            "(EMAIL TEXT PRIMARY KEY, " +
-                            "ACCESS_TOKEN TEXT, " +
-                            "SECRET_KEY TEXT, " +
-                            "ACCESS_KEY TEXT, " +
-                            "IS_ACTIVE INT)");
-        } catch (Exception exception) {
-            System.out.println("Table creation error!");
-        }
-    }
+    /*
+    This method accepts a SELECT query and then using
+    executeQuery method fetch rows from database.
+
+    Every row is stored as a hashmap, where key is column name and value is column value.
 
+    Then every row stored as a hashmap is added to arraylist which is returned as a list of rows.
+     */
     public static ArrayList runQuery(String query){
         try {
             Statement statement = connection.createStatement();
@@ -71,7 +63,7 @@ public static ArrayList runQuery(String query){
             return dataSet;
 
         } catch (Exception exception) {
-            System.out.println("Error while getting records from database.");
+            System.out.println("Database error: " + exception.getMessage());
         }
 
         return null;
@@ -82,23 +74,10 @@ public static void executeUpdate(String query){
             Statement statement = connection.createStatement();
             statement.executeUpdate(query);
         } catch (Exception exception) {
-            System.out.println("While inserting: " + exception.getMessage());
+            System.out.println("Database error: " + exception.getMessage());
         }
     }
 
-    public static void queryTest(){
-//        try {
-//            Statement statement = connection.createStatement();
-//            ResultSet rs = statement.executeQuery("SELECT * FROM user WHERE email = 'gulahmed@codesync.com'");
-//
-//            while (rs.next()){
-//                System.out.println("Testing!!!! : " + rs.getString(3));
-//            }
-//        } catch (Exception exception) {
-//            System.out.println("Error while getting records from database.");
-//        }
-    }
-
     public static void disconnect(){
         try {
             connection.close();
diff --git a/src/main/java/org/intellij/sdk/codesync/ProjectOpenCloseListener.java b/src/main/java/org/intellij/sdk/codesync/ProjectOpenCloseListener.java
index 97870d48..8f57af91 100644
--- a/src/main/java/org/intellij/sdk/codesync/ProjectOpenCloseListener.java
+++ b/src/main/java/org/intellij/sdk/codesync/ProjectOpenCloseListener.java
@@ -75,8 +75,6 @@ public void projectOpened(@NotNull Project project) {
       return;
     }
 
-    Database.initiate();
-
     // Acquire the lock now.
     // Keep a very low expiry to make sure, if user switches between projects then lock does not cause issues.
     Instant expiry = Instant.now().plus(5, ChronoUnit.SECONDS);
diff --git a/src/main/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetup.java b/src/main/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetup.java
index 32d251dd..2f97c827 100644
--- a/src/main/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetup.java
+++ b/src/main/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetup.java
@@ -11,6 +11,7 @@
 import com.intellij.openapi.project.Project;
 import kotlin.Pair;
 import org.intellij.sdk.codesync.CodeSyncLogger;
+import org.intellij.sdk.codesync.Database;
 import org.intellij.sdk.codesync.NotificationManager;
 import org.intellij.sdk.codesync.Utils;
 import org.intellij.sdk.codesync.auth.CodeSyncAuthServer;
@@ -208,6 +209,7 @@ public static void createSystemDirectories() {
                 CodeSyncYmlFile.createFile(systemFilePath);
             }
         }
+        Database.initiate();
     }
 
     /*
diff --git a/src/main/java/org/intellij/sdk/codesync/DataClass/UserTable.java b/src/main/java/org/intellij/sdk/codesync/database/UserTable.java
similarity index 96%
rename from src/main/java/org/intellij/sdk/codesync/DataClass/UserTable.java
rename to src/main/java/org/intellij/sdk/codesync/database/UserTable.java
index 3bac5160..d5282285 100644
--- a/src/main/java/org/intellij/sdk/codesync/DataClass/UserTable.java
+++ b/src/main/java/org/intellij/sdk/codesync/database/UserTable.java
@@ -1,4 +1,4 @@
-package org.intellij.sdk.codesync.DataClass;
+package org.intellij.sdk.codesync.database;
 
 import org.intellij.sdk.codesync.Database;
 import org.intellij.sdk.codesync.files.UserFile;
@@ -52,7 +52,7 @@ public static UserFile.User getActiveUser(){
 
     }
 
-    public static UserFile.User getUserByEmail(String email){
+    public static UserFile.User getByEmail(String email){
         String query = String.format("SELECT * FROM user WHERE email = '%s'", email);
         ArrayList<HashMap<String, Object>> usersArray = Database.runQuery(query);
 
diff --git a/src/main/java/org/intellij/sdk/codesync/DataClass/TransformFileToDB.java b/src/main/java/org/intellij/sdk/codesync/database/migrations/MigrateUser.java
similarity index 92%
rename from src/main/java/org/intellij/sdk/codesync/DataClass/TransformFileToDB.java
rename to src/main/java/org/intellij/sdk/codesync/database/migrations/MigrateUser.java
index d52f9851..da653f59 100644
--- a/src/main/java/org/intellij/sdk/codesync/DataClass/TransformFileToDB.java
+++ b/src/main/java/org/intellij/sdk/codesync/database/migrations/MigrateUser.java
@@ -1,7 +1,7 @@
-package org.intellij.sdk.codesync.DataClass;
+package org.intellij.sdk.codesync.database.migrations;
 
 import com.google.common.io.CharStreams;
-import org.intellij.sdk.codesync.Database;
+import org.intellij.sdk.codesync.database.UserTable;
 import org.intellij.sdk.codesync.exceptions.InvalidYmlFileError;
 import org.intellij.sdk.codesync.files.UserFile;
 import org.yaml.snakeyaml.Yaml;
@@ -12,7 +12,7 @@
 import java.util.Map;
 
 import static org.intellij.sdk.codesync.Constants.USER_FILE_PATH;
-public class TransformFileToDB {
+public class MigrateUser {
 
     File userFile = new File(USER_FILE_PATH);
     public Map<String, Object> contentsMap;
@@ -50,7 +50,7 @@ private void loadYmlContent () throws InvalidYmlFileError {
         }
     }
 
-    public void readUsersInFile(){
+    public void migrateData(){
         try{
             readYml();
             loadYmlContent();
diff --git a/src/main/java/org/intellij/sdk/codesync/files/UserFile.java b/src/main/java/org/intellij/sdk/codesync/files/UserFile.java
index 5be458b2..649c3883 100644
--- a/src/main/java/org/intellij/sdk/codesync/files/UserFile.java
+++ b/src/main/java/org/intellij/sdk/codesync/files/UserFile.java
@@ -1,6 +1,6 @@
 package org.intellij.sdk.codesync.files;
 
-import org.intellij.sdk.codesync.DataClass.UserTable;
+import org.intellij.sdk.codesync.database.UserTable;
 import org.intellij.sdk.codesync.exceptions.FileNotCreatedError;
 import org.intellij.sdk.codesync.exceptions.InvalidYmlFileError;
 import org.intellij.sdk.codesync.utils.CommonUtils;
@@ -137,7 +137,7 @@ public static String getAccessToken() {
     Get the user matching the given email.
      */
     public User getUser(String userEmail) {
-        return UserTable.getUserByEmail(userEmail);
+        return UserTable.getByEmail(userEmail);
     }
 
     /*
diff --git a/src/main/main.iml b/src/main/main.iml
deleted file mode 100644
index 908ad4f5..00000000
--- a/src/main/main.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/src/test/test.iml b/src/test/test.iml
deleted file mode 100644
index a0e49a3b..00000000
--- a/src/test/test.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/java" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file

From 56d052590cf4aaae4fc58474a4b5b59a4313522b Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Mon, 13 Mar 2023 08:37:24 +0500
Subject: [PATCH 09/67] Resolving conflict in CodeSyncLogger file

---
 .../intellij/sdk/codesync/CodeSyncLogger.java |  29 +--
 .../intellij/sdk/codesync/HandleBuffer.java   |   6 +-
 .../intellij/sdk/codesync/PopulateBuffer.java |  22 +-
 .../sdk/codesync/alerts/ActivityAlerts.java   |   6 +-
 .../sdk/codesync/auth/AuthAction.java         |  35 +--
 .../sdk/codesync/auth/Authenticator.java      |  25 +-
 .../codesync/codeSyncSetup/CodeSyncSetup.java |  58 +----
 .../commands/ResumeCodeSyncCommand.java       |   4 +-
 .../sdk/codesync/database/UserTable.java      |  56 ++---
 .../database/migrations/MigrateUser.java      |   6 +-
 .../intellij/sdk/codesync/files/UserFile.java | 219 ------------------
 .../sdk/codesync/models/UserAccount.java      | 182 +++++++++++++++
 .../sdk/codesync/state/StateUtils.java        |  19 +-
 13 files changed, 263 insertions(+), 404 deletions(-)
 delete mode 100644 src/main/java/org/intellij/sdk/codesync/files/UserFile.java
 create mode 100644 src/main/java/org/intellij/sdk/codesync/models/UserAccount.java

diff --git a/src/main/java/org/intellij/sdk/codesync/CodeSyncLogger.java b/src/main/java/org/intellij/sdk/codesync/CodeSyncLogger.java
index bd778af4..f5b86227 100644
--- a/src/main/java/org/intellij/sdk/codesync/CodeSyncLogger.java
+++ b/src/main/java/org/intellij/sdk/codesync/CodeSyncLogger.java
@@ -11,7 +11,7 @@
 import software.amazon.awssdk.services.cloudwatchlogs.model.*;
 
 import org.intellij.sdk.codesync.exceptions.InvalidYmlFileError;
-import org.intellij.sdk.codesync.files.UserFile;
+import org.intellij.sdk.codesync.models.UserAccount;
 import static org.intellij.sdk.codesync.Constants.*;
 
 import java.io.FileNotFoundException;
@@ -114,26 +114,19 @@ private static void logEvent(String message, String type) {
         logEvent(message, null, type);
     }
 
-    private static void logEvent(String message, String userEmail, String type) {
-        UserFile.User user = null;
-        UserFile userFile = null;
+    public static void logEvent(String message, String userEmail, String type) {
+        UserAccount userAccount = new UserAccount();
         logConsoleMessage(message, type);
 
-        try {
-            userFile = new UserFile(USER_FILE_PATH);
-        } catch (FileNotFoundException | InvalidYmlFileError e) {
-            e.printStackTrace();
-        }
-
-        if (userEmail != null && userFile != null) {
-            user = userFile.getUser(userEmail);
-        } else if (userFile != null) {
-            user = userFile.getActiveUser();
+        if (userEmail != null && userAccount != null) {
+            userAccount = userAccount.getUser(userEmail);
+        } else if (userAccount != null) {
+            userAccount = userAccount.getActiveUser();
         }
 
         String streamName, accessKey, secretKey;
 
-        if (user == null || user.getAccessKey() == null || user.getSecretKey() == null || user.getUserEmail() == null) {
+        if (userAccount == null || userAccount.getAccessKey() == null || userAccount.getSecretKey() == null || userAccount.getUserEmail() == null) {
             //Log with the plugin user.
             streamName = PLUGIN_USER_LOG_STREAM;
             if (PLUGIN_USER_ACCESS_KEY == null || PLUGIN_USER_SECRET_KEY == null) {
@@ -145,9 +138,9 @@ private static void logEvent(String message, String userEmail, String type) {
                 secretKey = PLUGIN_USER_SECRET_KEY;
             }
         } else {
-            streamName = user.getUserEmail();
-            accessKey = user.getAccessKey();
-            secretKey = user.getSecretKey();
+            streamName = userAccount.getUserEmail();
+            accessKey = userAccount.getAccessKey();
+            secretKey = userAccount.getSecretKey();
         }
 
         try {
diff --git a/src/main/java/org/intellij/sdk/codesync/HandleBuffer.java b/src/main/java/org/intellij/sdk/codesync/HandleBuffer.java
index a1fca822..aba6c2bf 100644
--- a/src/main/java/org/intellij/sdk/codesync/HandleBuffer.java
+++ b/src/main/java/org/intellij/sdk/codesync/HandleBuffer.java
@@ -6,7 +6,7 @@
 import org.intellij.sdk.codesync.clients.CodeSyncWebSocketClient;
 import org.intellij.sdk.codesync.exceptions.*;
 import org.intellij.sdk.codesync.files.*;
-import org.intellij.sdk.codesync.locks.CodeSyncLock;
+import org.intellij.sdk.codesync.models.UserAccount;
 import org.intellij.sdk.codesync.repoManagers.DeletedRepoManager;
 import org.intellij.sdk.codesync.repoManagers.OriginalsRepoManager;
 import org.intellij.sdk.codesync.repoManagers.ShadowRepoManager;
@@ -208,7 +208,7 @@ public static void handleBuffer(Project project) {
             }
 
             ConfigRepo configRepo = configFile.getRepo(diffFile.repoPath);
-            String accessToken = UserFile.getAccessToken(configRepo.email);
+            String accessToken = UserAccount.getAccessToken(configRepo.email);
 
             if (accessToken == null) {
                 CodeSyncLogger.critical(String.format(
@@ -355,7 +355,7 @@ public static void handleBuffer(Project project) {
         // Send Diffs in a single request.
 
         ConfigRepo configRepo = configFile.getRepo(currentRepo);
-        String accessToken = UserFile.getAccessToken(configRepo.email);
+        String accessToken = UserAccount.getAccessToken(configRepo.email);
         if (accessToken ==  null) {
             CodeSyncLogger.warning(String.format(
                     "Access token for user '%s' not present so skipping diffs for repo '%s'.",
diff --git a/src/main/java/org/intellij/sdk/codesync/PopulateBuffer.java b/src/main/java/org/intellij/sdk/codesync/PopulateBuffer.java
index 06039ee6..4d94ec1d 100644
--- a/src/main/java/org/intellij/sdk/codesync/PopulateBuffer.java
+++ b/src/main/java/org/intellij/sdk/codesync/PopulateBuffer.java
@@ -6,12 +6,11 @@
 import org.intellij.sdk.codesync.codeSyncSetup.CodeSyncSetup;
 import org.intellij.sdk.codesync.exceptions.FileInfoError;
 import org.intellij.sdk.codesync.exceptions.InvalidConfigFileError;
-import org.intellij.sdk.codesync.exceptions.InvalidYmlFileError;
 import org.intellij.sdk.codesync.factories.DiffFactory;
 import org.intellij.sdk.codesync.files.ConfigFile;
 import org.intellij.sdk.codesync.files.ConfigRepo;
 import org.intellij.sdk.codesync.files.ConfigRepoBranch;
-import org.intellij.sdk.codesync.files.UserFile;
+import org.intellij.sdk.codesync.models.UserAccount;
 import org.intellij.sdk.codesync.repoManagers.DeletedRepoManager;
 import org.intellij.sdk.codesync.repoManagers.OriginalsRepoManager;
 import org.intellij.sdk.codesync.repoManagers.ShadowRepoManager;
@@ -20,7 +19,6 @@
 import static org.intellij.sdk.codesync.Constants.*;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
@@ -167,16 +165,8 @@ public static Map<String, String> detectBranchChange() {
             return reposToUpdate;
         }
         Map<String, ConfigRepo> configRepoMap = configFile.getRepos();
-        UserFile userFile;
-
-        try {
-            userFile = new UserFile(USER_FILE_PATH);
-        } catch (FileNotFoundException | InvalidYmlFileError error) {
-            CodeSyncLogger.critical(String.format(
-                    "[POPULATE_BUFFER] User file error, %s.\n", error.getMessage()
-            ));
-            return reposToUpdate;
-        }
+        UserAccount userAccount;
+        userAccount = new UserAccount();
 
         for (Map.Entry<String, ConfigRepo> configRepoEntry: configRepoMap.entrySet()) {
             String repoPath = configRepoEntry.getKey();
@@ -193,13 +183,13 @@ public static Map<String, String> detectBranchChange() {
                 continue;
             }
 
-            UserFile.User user = userFile.getUser(configRepo.email);
-            if (user == null) {
+            userAccount = userAccount.getUser(configRepo.email);
+            if (userAccount == null) {
                 // Could not find the user with this email in user.yml file.
                 continue;
             }
 
-            if (user.getAccessToken() == null) {
+            if (userAccount.getAccessToken() == null) {
                 CodeSyncLogger.error(String.format("Access token not found for repo: %s, %s`.", repoPath, configRepo.email));
                 continue;
             }
diff --git a/src/main/java/org/intellij/sdk/codesync/alerts/ActivityAlerts.java b/src/main/java/org/intellij/sdk/codesync/alerts/ActivityAlerts.java
index 3c44e533..19c17d49 100644
--- a/src/main/java/org/intellij/sdk/codesync/alerts/ActivityAlerts.java
+++ b/src/main/java/org/intellij/sdk/codesync/alerts/ActivityAlerts.java
@@ -6,7 +6,7 @@
 import org.intellij.sdk.codesync.Constants;
 import org.intellij.sdk.codesync.clients.CodeSyncClient;
 import org.intellij.sdk.codesync.files.AlertsFile;
-import org.intellij.sdk.codesync.files.UserFile;
+import org.intellij.sdk.codesync.models.UserAccount;
 import org.intellij.sdk.codesync.locks.CodeSyncLock;
 import org.intellij.sdk.codesync.ui.dialogs.ActivityAlertDialog;
 import org.intellij.sdk.codesync.utils.CommonUtils;
@@ -86,8 +86,8 @@ public static void showActivityAlert(Project project) {
         }
         CodeSyncLogger.debug("[CODESYNC_DAEMON] [ACTIVITY_ALERT] Activity alert lock acquired.");
 
-        String accessToken = UserFile.getAccessToken();
-        String email = UserFile.getEmail();
+        String accessToken = UserAccount.getAccessTokenByEmail();
+        String email = UserAccount.getEmail();
 
         if (accessToken == null) {
             ActivityAlerts.remindLater(5);
diff --git a/src/main/java/org/intellij/sdk/codesync/auth/AuthAction.java b/src/main/java/org/intellij/sdk/codesync/auth/AuthAction.java
index d9d37eca..bc846d10 100644
--- a/src/main/java/org/intellij/sdk/codesync/auth/AuthAction.java
+++ b/src/main/java/org/intellij/sdk/codesync/auth/AuthAction.java
@@ -9,17 +9,11 @@
 import org.intellij.sdk.codesync.NotificationManager;
 import org.intellij.sdk.codesync.commands.ClearReposToIgnoreCache;
 import org.intellij.sdk.codesync.commands.ReloadStateCommand;
-import org.intellij.sdk.codesync.exceptions.InvalidYmlFileError;
-import org.intellij.sdk.codesync.files.UserFile;
+import org.intellij.sdk.codesync.models.UserAccount;
 import org.intellij.sdk.codesync.state.PluginState;
 import org.intellij.sdk.codesync.state.StateUtils;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.FileNotFoundException;
-
-import static org.intellij.sdk.codesync.Constants.*;
-
-
 public class AuthAction extends AnAction {
     @Override
     public void update(@NotNull AnActionEvent e) {
@@ -59,34 +53,13 @@ public void actionPerformed(@NotNull AnActionEvent e) {
             server =  CodeSyncAuthServer.getInstance();
             String targetURL = server.getAuthorizationUrl();
             if (pluginState.isAuthenticated) {
-                UserFile userFile;
-                try {
-                    userFile = new UserFile(USER_FILE_PATH);
-                } catch (FileNotFoundException error) {
-                    NotificationManager.notifyError(
-                            "An error occurred trying to logout the user, please tyr again later.", project
-                    );
-                    CodeSyncLogger.error(
-                            String.format("[INTELLIJ_AUTH_ERROR]: auth file not found. Error: %s", error.getMessage())
-                    );
-                    return;
-                } catch (InvalidYmlFileError error) {
-                    error.printStackTrace();
-                    NotificationManager.notifyError(
-                            "An error occurred trying to logout the user, please tyr again later.", project
-                    );
-                    CodeSyncLogger.critical(
-                            String.format("[INTELLIJ_AUTH_ERROR]: Invalid auth file. Error: %s", error.getMessage()),
-                            pluginState.userEmail
-                    );
-                    // Could not read user file.
-                    return;
-                }
+                UserAccount userAccount;
+                userAccount = new UserAccount();
 
                 // Clear any cache that depends on user authentication status.
                 new ClearReposToIgnoreCache().execute();
 
-                userFile.makeAllUsersInActive();
+                userAccount.makeAllUsersInActive();
 
                 // Reload the state now.
                 StateUtils.reloadState(project);
diff --git a/src/main/java/org/intellij/sdk/codesync/auth/Authenticator.java b/src/main/java/org/intellij/sdk/codesync/auth/Authenticator.java
index d88730aa..f86b75c6 100644
--- a/src/main/java/org/intellij/sdk/codesync/auth/Authenticator.java
+++ b/src/main/java/org/intellij/sdk/codesync/auth/Authenticator.java
@@ -4,17 +4,14 @@
 
 import org.intellij.sdk.codesync.CodeSyncLogger;
 import org.intellij.sdk.codesync.commands.ClearReposToIgnoreCache;
-import org.intellij.sdk.codesync.exceptions.FileLockedError;
 import org.intellij.sdk.codesync.exceptions.InvalidJsonError;
-import org.intellij.sdk.codesync.exceptions.InvalidYmlFileError;
 import org.intellij.sdk.codesync.exceptions.RequestError;
-import org.intellij.sdk.codesync.files.UserFile;
+import org.intellij.sdk.codesync.models.UserAccount;
 import org.json.simple.JSONObject;
 
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Map;
 
@@ -77,27 +74,13 @@ public boolean createUser(String accessToken, String idToken){
             );
             return false;
         }
-        UserFile userFile;
-        try {
-            userFile = new UserFile(USER_FILE_PATH);
-        } catch (FileNotFoundException e) {
-            CodeSyncLogger.error(
-                String.format("[INTELLIJ_AUTH_ERROR]: auth file not found. Error: %s", e.getMessage())
-            );
-            return false;
-        } catch (InvalidYmlFileError error) {
-            error.printStackTrace();
-            CodeSyncLogger.critical(
-                String.format("[INTELLIJ_AUTH_ERROR]: Invalid auth file. Error: %s", error.getMessage())
-            );
-            // Could not read user file.
-            return false;
-        }
+        UserAccount userAccount;
+        userAccount = new UserAccount();
         String userEmail = claims.get("email").asString();
 
         // Clear any cache that depends on user authentication status.
         new ClearReposToIgnoreCache().execute();
-        userFile.setActiveUser(userEmail, accessToken);
+        userAccount.setActiveUser(userEmail, accessToken);
 
         CodeSyncLogger.debug("[INTELLIJ_AUTH]: User completed login flow.");
         return true;
diff --git a/src/main/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetup.java b/src/main/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetup.java
index 2f97c827..a1f19bae 100644
--- a/src/main/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetup.java
+++ b/src/main/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetup.java
@@ -24,6 +24,7 @@
 import org.intellij.sdk.codesync.exceptions.network.ServerConnectionError;
 import org.intellij.sdk.codesync.exceptions.repo.RepoNotActive;
 import org.intellij.sdk.codesync.files.*;
+import org.intellij.sdk.codesync.models.UserAccount;
 import org.intellij.sdk.codesync.state.PluginState;
 import org.intellij.sdk.codesync.state.StateUtils;
 import org.intellij.sdk.codesync.ui.dialogs.RepoPublicPrivateDialog;
@@ -41,7 +42,6 @@
 import org.json.simple.JSONObject;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
@@ -72,21 +72,10 @@ public static void disconnectRepo(Project project, String repoPath, String repoN
             if (!configFile.isRepoActive(repoPath)) {
                throw new RepoNotActive(String.format("Repo '%s' is not active and can not be disconnected.", repoName));
             };
-            UserFile userFile;
-
-            try {
-                userFile = new UserFile(USER_FILE_PATH);
-            } catch (FileNotFoundException | InvalidYmlFileError e) {
-                throw new UserFileError(
-                    String.format(
-                        "Repo '%s' could not be disconnected because there was an error trying to read user file. Error: %s",
-                        repoName, e.getMessage()
-                    )
-                );
-            }
+            UserAccount userAccount = new UserAccount();
             ConfigRepo configRepo = configFile.getRepo(repoPath);
-            UserFile.User user = userFile.getUser(configRepo.email);
-            if (user == null) {
+            userAccount = userAccount.getUser(configRepo.email);
+            if (userAccount == null) {
                 throw new UserFileError(
                     String.format(
                         "Repo '%s' could not be disconnected because user data is missing from user file.",
@@ -94,7 +83,7 @@ public static void disconnectRepo(Project project, String repoPath, String repoN
                     )
                 );
             }
-            String accessToken = user.getAccessToken();
+            String accessToken = userAccount.getAccessToken();
             CodeSyncClient codeSyncClient = new CodeSyncClient();
 
             if (!codeSyncClient.isServerUp()) {
@@ -257,13 +246,8 @@ public static boolean validateAccessToken(String accessToken) throws InvalidAcce
      */
     public static boolean checkUserAccess(Project project, String repoPath, String repoName, String branchName, boolean skipSyncPrompt, boolean isSyncingBranch) {
         String accessToken;
-        try {
-            UserFile userFile = new UserFile(USER_FILE_PATH);
-            accessToken = userFile.getActiveAccessToken();
-        } catch (FileNotFoundException | InvalidYmlFileError error) {
-            // Set access token to null to trigger user signup.
-            accessToken = null;
-        }
+        UserAccount userAccount = new UserAccount();
+        accessToken = userAccount.getActiveAccessToken();
 
         // User already has access token, no need to proceed.
         if (accessToken != null) {
@@ -487,7 +471,7 @@ public static boolean uploadRepo(String repoPath, String repoName, String[] file
             }
         }
 
-        String accessToken = UserFile.getAccessToken();
+        String accessToken = UserAccount.getAccessTokenByEmail();
         if (accessToken == null) {
             // Show error message.
             if (!isSyncingBranch) {
@@ -654,29 +638,9 @@ public static boolean uploadRepo(String repoPath, String repoName, String[] file
     }
 
     public static void saveIamUser(String email, String iamAccessKey, String iamSecretKey) {
-        UserFile userFile;
-        try {
-            userFile = new UserFile(USER_FILE_PATH, true);
-        } catch (FileNotFoundException e) {
-            CodeSyncLogger.critical(
-                    String.format("[INTELLI_REPO_INIT_ERROR]: auth file not found. Error: %s", e.getMessage())
-            );
-            return;
-        } catch (InvalidYmlFileError error) {
-            error.printStackTrace();
-            CodeSyncLogger.critical(
-                    String.format("[INTELLI_REPO_INIT_ERROR]: Invalid auth file. Error: %s", error.getMessage())
-            );
-            // Could not read user file.
-            return;
-        } catch (FileNotCreatedError error) {
-            CodeSyncLogger.critical(
-                    String.format("[INTELLI_REPO_INIT_ERROR]: Could not create user auth file. Error %s", error.getMessage())
-            );
-            return;
-        }
-
-        userFile.setActiveUser(email, iamAccessKey, iamSecretKey);
+        UserAccount userAccount;
+        userAccount = new UserAccount();
+        userAccount.setActiveUser(email, iamAccessKey, iamSecretKey);
     }
 
     public static void saveFileIds(
diff --git a/src/main/java/org/intellij/sdk/codesync/commands/ResumeCodeSyncCommand.java b/src/main/java/org/intellij/sdk/codesync/commands/ResumeCodeSyncCommand.java
index 6663e2e8..20dd2674 100644
--- a/src/main/java/org/intellij/sdk/codesync/commands/ResumeCodeSyncCommand.java
+++ b/src/main/java/org/intellij/sdk/codesync/commands/ResumeCodeSyncCommand.java
@@ -6,7 +6,7 @@
 import org.intellij.sdk.codesync.auth.CodeSyncAuthServer;
 import org.intellij.sdk.codesync.codeSyncSetup.CodeSyncSetup;
 import org.intellij.sdk.codesync.exceptions.InvalidAccessTokenError;
-import org.intellij.sdk.codesync.files.UserFile;
+import org.intellij.sdk.codesync.models.UserAccount;
 
 /*
 This command first checks the existence of access token in user.yml file and if it is present
@@ -38,7 +38,7 @@ public ResumeCodeSyncCommand(Project project, String repoPath, String repoName,
     }
 
     public void execute() {
-        String accessToken = UserFile.getAccessToken();
+        String accessToken = UserAccount.getAccessTokenByEmail();
 
         try {
             if (accessToken != null && CodeSyncSetup.validateAccessToken(accessToken)) {
diff --git a/src/main/java/org/intellij/sdk/codesync/database/UserTable.java b/src/main/java/org/intellij/sdk/codesync/database/UserTable.java
index d5282285..92a6580e 100644
--- a/src/main/java/org/intellij/sdk/codesync/database/UserTable.java
+++ b/src/main/java/org/intellij/sdk/codesync/database/UserTable.java
@@ -1,7 +1,7 @@
 package org.intellij.sdk.codesync.database;
 
 import org.intellij.sdk.codesync.Database;
-import org.intellij.sdk.codesync.files.UserFile;
+import org.intellij.sdk.codesync.models.UserAccount;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -14,14 +14,14 @@ public class UserTable {
     static String access_key;
     static int is_active;
 
-    public static void insertNewUser(UserFile.User user){
-        setValues(user);
+    public static void insertNewUser(UserAccount userAccount){
+        setValues(userAccount);
         String query = String.format("INSERT INTO user VALUES(%s, %s, %s, %s, %d)", email, access_token, secret_key, access_key, is_active);
         Database.executeUpdate(query);
     }
 
-    public static void updateUser(UserFile.User user){
-        setValues(user);
+    public static void updateUser(UserAccount userAccount){
+        setValues(userAccount);
         String query = String.format("UPDATE user SET access_token = %s, secret_key = %s, access_key = %s, is_active = %d WHERE email = %s", access_token, secret_key, access_key, is_active, email);
         Database.executeUpdate(query);
     }
@@ -31,54 +31,54 @@ public static void updateAllUsersInActive(){
         Database.executeUpdate(query);
     }
 
-    public static UserFile.User getActiveUser(){
+    public static UserAccount getActiveUser(){
         String query = "SELECT * FROM user WHERE is_active = 1";
         ArrayList<HashMap<String, Object>> usersArray = Database.runQuery(query);
 
         if(usersArray.size() > 0){
-            UserFile.User user = new UserFile.User((String) usersArray.get(0).get("EMAIL"));
-            user.setAccessKey((String) usersArray.get(0).getOrDefault("ACCESS_KEY", null));
-            user.setAccessToken((String) usersArray.get(0).getOrDefault("ACCESS_TOKEN", null));
-            user.setSecretKey((String) usersArray.get(0).getOrDefault("SECRET_KEY", null));
+            UserAccount userAccount = new UserAccount((String) usersArray.get(0).get("EMAIL"));
+            userAccount.setAccessKey((String) usersArray.get(0).getOrDefault("ACCESS_KEY", null));
+            userAccount.setAccessToken((String) usersArray.get(0).getOrDefault("ACCESS_TOKEN", null));
+            userAccount.setSecretKey((String) usersArray.get(0).getOrDefault("SECRET_KEY", null));
             if((String) usersArray.get(0).getOrDefault("IS_ACTIVE", null) == "1"){
-                user.makeActive();
+                userAccount.makeActive();
             }else {
-                user.makeInActive();
+                userAccount.makeInActive();
             }
-            return user;
+            return userAccount;
         }
 
         return null;
 
     }
 
-    public static UserFile.User getByEmail(String email){
+    public static UserAccount getByEmail(String email){
         String query = String.format("SELECT * FROM user WHERE email = '%s'", email);
         ArrayList<HashMap<String, Object>> usersArray = Database.runQuery(query);
 
         if(usersArray.size() > 0){
-            UserFile.User user = new UserFile.User((String) usersArray.get(0).get("EMAIL"));
-            user.setAccessKey((String) usersArray.get(0).getOrDefault("ACCESS_KEY", null));
-            user.setAccessToken((String) usersArray.get(0).getOrDefault("ACCESS_TOKEN", null));
-            user.setSecretKey((String) usersArray.get(0).getOrDefault("SECRET_KEY", null));
+            UserAccount userAccount = new UserAccount((String) usersArray.get(0).get("EMAIL"));
+            userAccount.setAccessKey((String) usersArray.get(0).getOrDefault("ACCESS_KEY", null));
+            userAccount.setAccessToken((String) usersArray.get(0).getOrDefault("ACCESS_TOKEN", null));
+            userAccount.setSecretKey((String) usersArray.get(0).getOrDefault("SECRET_KEY", null));
             if((String) usersArray.get(0).getOrDefault("IS_ACTIVE", null) == "1"){
-                user.makeActive();
+                userAccount.makeActive();
             }else {
-                user.makeInActive();
+                userAccount.makeInActive();
             }
-            return user;
+            return userAccount;
         }
 
         return null;
     }
 
-    static void setValues(UserFile.User user){
-        email = user.getUserEmail() != null? String.format("'%s'", user.getUserEmail()) : "NULL";
-        access_token = user.getAccessToken() != null? String.format("'%s'", user.getAccessToken()) : "NULL";
-        secret_key = user.getSecretKey() != null? String.format("'%s'", user.getSecretKey()) : "NULL";
-        access_key = user.getAccessKey() != null? String.format("'%s'", user.getAccessKey()) : "NULL";
-        if(user.getActive() != null){
-            is_active = user.getActive()? 1 : 0;
+    static void setValues(UserAccount userAccount){
+        email = userAccount.getUserEmail() != null? String.format("'%s'", userAccount.getUserEmail()) : "NULL";
+        access_token = userAccount.getAccessToken() != null? String.format("'%s'", userAccount.getAccessToken()) : "NULL";
+        secret_key = userAccount.getSecretKey() != null? String.format("'%s'", userAccount.getSecretKey()) : "NULL";
+        access_key = userAccount.getAccessKey() != null? String.format("'%s'", userAccount.getAccessKey()) : "NULL";
+        if(userAccount.getActive() != null){
+            is_active = userAccount.getActive()? 1 : 0;
         }else{
             is_active = 0;
         }
diff --git a/src/main/java/org/intellij/sdk/codesync/database/migrations/MigrateUser.java b/src/main/java/org/intellij/sdk/codesync/database/migrations/MigrateUser.java
index da653f59..b654dbd4 100644
--- a/src/main/java/org/intellij/sdk/codesync/database/migrations/MigrateUser.java
+++ b/src/main/java/org/intellij/sdk/codesync/database/migrations/MigrateUser.java
@@ -3,7 +3,7 @@
 import com.google.common.io.CharStreams;
 import org.intellij.sdk.codesync.database.UserTable;
 import org.intellij.sdk.codesync.exceptions.InvalidYmlFileError;
-import org.intellij.sdk.codesync.files.UserFile;
+import org.intellij.sdk.codesync.models.UserAccount;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.error.YAMLException;
 
@@ -16,7 +16,7 @@ public class MigrateUser {
 
     File userFile = new File(USER_FILE_PATH);
     public Map<String, Object> contentsMap;
-    public Map<String, UserFile.User> users = new HashMap<>();
+    public Map<String, UserAccount> users = new HashMap<>();
 
     private void readYml() throws FileNotFoundException, InvalidYmlFileError {
         Yaml yaml = new Yaml();
@@ -40,7 +40,7 @@ private void loadYmlContent () throws InvalidYmlFileError {
             for (Map.Entry<String, Object> userEntry : this.contentsMap.entrySet()) {
                 if (userEntry.getValue() != null) {
                     Map<String, Object> userCredentials = (Map<String, Object>) userEntry.getValue();
-                    this.users.put(userEntry.getKey(), new UserFile.User(userEntry.getKey(), userCredentials));
+                    this.users.put(userEntry.getKey(), new UserAccount(userEntry.getKey(), userCredentials));
                 }
             }
         } catch (ClassCastException e){
diff --git a/src/main/java/org/intellij/sdk/codesync/files/UserFile.java b/src/main/java/org/intellij/sdk/codesync/files/UserFile.java
deleted file mode 100644
index 649c3883..00000000
--- a/src/main/java/org/intellij/sdk/codesync/files/UserFile.java
+++ /dev/null
@@ -1,219 +0,0 @@
-package org.intellij.sdk.codesync.files;
-
-import org.intellij.sdk.codesync.database.UserTable;
-import org.intellij.sdk.codesync.exceptions.FileNotCreatedError;
-import org.intellij.sdk.codesync.exceptions.InvalidYmlFileError;
-import org.intellij.sdk.codesync.utils.CommonUtils;
-
-import java.io.*;
-import java.util.Map;
-
-public class UserFile{
-
-
-    public static class User {
-        //New chagnes
-        String userEmail, accessKey = null, secretKey = null, accessToken = null;
-        Boolean isActive = false;
-
-        public User(String userEmail, Map<String, Object> userCredentials) {
-            this.userEmail = userEmail;
-            this.accessKey = (String) userCredentials.getOrDefault("access_key", null);
-            this.secretKey = (String) userCredentials.getOrDefault("secret_key", null);
-            this.accessToken = (String) userCredentials.getOrDefault("access_token", null);
-            this.isActive = CommonUtils.getBoolValue(userCredentials, "is_active", false);
-        }
-
-        public User(String userEmail) {
-            this.userEmail = userEmail;
-        }
-
-        /*
-        Construct a user instance with Auth0 access token.
-         */
-        public User(String userEmail, String accessToken) {
-            this.userEmail = userEmail;
-            this.accessToken = accessToken;
-            this.isActive = true;
-        }
-
-        /*
-        Construct a user instance with IAM access and secret.
-         */
-        public User(String userEmail, String iamAccessKey, String iamSecretKey) {
-            this.userEmail = userEmail;
-            this.accessKey = iamAccessKey;
-            this.secretKey = iamSecretKey;
-        }
-
-        public String getUserEmail () {
-            return this.userEmail;
-        }
-        public String getAccessKey () { return this.accessKey; }
-        public String getAccessToken () { return this.accessToken; }
-        public String getSecretKey () {
-            return this.secretKey;
-        }
-
-        public void setAccessKey (String accessKey) { this.accessKey = accessKey; }
-        public void setAccessToken (String accessToken) { this.accessToken = accessToken; }
-        public void setSecretKey (String secretKey) { this.secretKey = secretKey; }
-        public void makeActive () { this.isActive = true; }
-        public void makeInActive () { this.isActive = false; }
-
-        public Boolean getActive() {
-            return isActive;
-        }
-    }
-
-    public UserFile (String filePath) throws FileNotFoundException, InvalidYmlFileError{
-        //UserFile constructor 1
-        System.out.println("UserFile constructor 1: " + filePath);
-    }
-
-    /*
-    Instantiate a user file, create the file if it does not exist.
-     */
-    public UserFile (String filePath, boolean shouldCreateIfAbsent)throws FileNotFoundException, FileNotCreatedError, InvalidYmlFileError{
-        //UserFile constructor 2
-        System.out.println("UserFile constructor 2: " + filePath + " " + shouldCreateIfAbsent);
-    }
-
-    /*
-    Get access token for the user or null.
-
-    This is a utility method and can be called in places where it has already been made sure that file with correct
-    access token will be present.
-     */
-    public static String getAccessToken(String email) {
-
-        UserFile userFile;
-
-        try{
-            userFile = new UserFile("FakePath");
-        } catch (InvalidYmlFileError e) {
-            throw new RuntimeException(e);
-        } catch (FileNotFoundException e) {
-            throw new RuntimeException(e);
-        }
-
-        UserFile.User user = email == null ? userFile.getActiveUser(): userFile.getActiveUser(email);
-        if (user != null) {
-            return user.getAccessToken();
-        }
-
-        return null;
-    }
-
-   /*
-    Get email of the default user or null.
-     */
-    public static String getEmail() {
-        UserFile userFile;
-
-        try{
-            userFile = new UserFile("FakePath");
-        } catch (InvalidYmlFileError e) {
-            throw new RuntimeException(e);
-        } catch (FileNotFoundException e) {
-            throw new RuntimeException(e);
-        }
-
-        UserFile.User user =  userFile.getActiveUser();
-        return user != null ? user.getUserEmail(): null;
-    }
-
-    /*
-    Get access token for the first user in the file or null.
-
-    This is a utility method and can be called in places where it has already been made sure that file with correct
-    access token will be present.
-     */
-    public static String getAccessToken() {
-        return getAccessToken(null);
-    }
-
-    /*
-    Get the user matching the given email.
-     */
-    public User getUser(String userEmail) {
-        return UserTable.getByEmail(userEmail);
-    }
-
-    /*
-     Get the access token of the active user from the map.
-     */
-    public String getActiveAccessToken() {
-        User user = this.getActiveUser();
-        if (user != null) {
-            return user.accessToken;
-        }
-        return null;
-    }
-
-    /*
-    Get the active user from the map.
-     */
-    public User getActiveUser(String email) {
-        User user = getUser(email);
-        if(user != null){
-            return user.isActive ? user: null;
-        }
-        return null;
-    }
-
-    /*
-    Get the active user from the map.
-     */
-    public User getActiveUser() {
-        return UserTable.getActiveUser();
-    }
-
-    /*
-    Set user using Auth0 access token.
-
-    This will also make sure that this user is set to active and all other users are
-    set to in-active via is_active flag.
-     */
-    public void setActiveUser(String userEmail, String accessToken) {
-        User user = getUser(userEmail);
-        if (user == null) {
-            user = new User(userEmail, accessToken);
-            // First mark all users in-active.
-            this.makeAllUsersInActive();
-            // Now mark the new user active.
-            user.makeActive();
-            UserTable.insertNewUser(user);
-        } else {
-            user.setAccessToken(accessToken);
-            // First mark all users in-active.
-            this.makeAllUsersInActive();
-            // Now mark the new user active.
-            user.makeActive();
-            UserTable.updateUser(user);
-        }
-    }
-
-    /*
-    Make all user's in-active by setting `is_active` to false.
-     */
-    public void makeAllUsersInActive() {
-        UserTable.updateAllUsersInActive();
-    }
-
-    /*
-    Set user using IAM access and secret.
-     */
-    public void setActiveUser(String userEmail, String iamAccessKey, String iamSecretKey) {
-        User user = getUser(userEmail);
-        if (user == null) {
-            user = new User(userEmail, iamAccessKey, iamSecretKey);
-            UserTable.insertNewUser(user);
-        } else {
-            user.setAccessKey(iamAccessKey);
-            user.setSecretKey(iamSecretKey);
-            UserTable.updateUser(user);
-        }
-    }
-
-}
diff --git a/src/main/java/org/intellij/sdk/codesync/models/UserAccount.java b/src/main/java/org/intellij/sdk/codesync/models/UserAccount.java
new file mode 100644
index 00000000..956df1a6
--- /dev/null
+++ b/src/main/java/org/intellij/sdk/codesync/models/UserAccount.java
@@ -0,0 +1,182 @@
+package org.intellij.sdk.codesync.models;
+
+import org.intellij.sdk.codesync.database.UserTable;
+import org.intellij.sdk.codesync.utils.CommonUtils;
+
+import java.util.Map;
+
+public class UserAccount {
+
+    public UserAccount(){}
+
+    String userEmail, accessKey = null, secretKey = null, accessToken = null;
+    Boolean isActive = false;
+
+    public UserAccount(String userEmail, Map<String, Object> userCredentials) {
+        this.userEmail = userEmail;
+        this.accessKey = (String) userCredentials.getOrDefault("access_key", null);
+        this.secretKey = (String) userCredentials.getOrDefault("secret_key", null);
+        this.accessToken = (String) userCredentials.getOrDefault("access_token", null);
+        this.isActive = CommonUtils.getBoolValue(userCredentials, "is_active", false);
+    }
+
+    public UserAccount(String userEmail) {
+        this.userEmail = userEmail;
+    }
+
+    /*
+    Construct a user instance with Auth0 access token.
+     */
+    public UserAccount(String userEmail, String accessToken) {
+        this.userEmail = userEmail;
+        this.accessToken = accessToken;
+        this.isActive = true;
+    }
+
+    /*
+    Construct a user instance with IAM access and secret.
+     */
+    public UserAccount(String userEmail, String iamAccessKey, String iamSecretKey) {
+        this.userEmail = userEmail;
+        this.accessKey = iamAccessKey;
+        this.secretKey = iamSecretKey;
+    }
+
+    public String getUserEmail () {
+        return this.userEmail;
+    }
+    public String getAccessKey () { return this.accessKey; }
+    public String getAccessToken () { return this.accessToken; }
+    public String getSecretKey () {
+        return this.secretKey;
+    }
+
+    public void setAccessKey (String accessKey) { this.accessKey = accessKey; }
+    public void setAccessToken (String accessToken) { this.accessToken = accessToken; }
+    public void setSecretKey (String secretKey) { this.secretKey = secretKey; }
+    public void makeActive () { this.isActive = true; }
+    public void makeInActive () { this.isActive = false; }
+    public Boolean getActive() {
+        return isActive;
+    }
+
+    /*
+    Get access token for the user or null.
+
+    This is a utility method and can be called in places where it has already been made sure that file with correct
+    access token will be present.
+     */
+    public static String getAccessToken(String email) {
+
+        UserAccount userAccount = new UserAccount();
+
+        userAccount = email == null ? userAccount.getActiveUser(): userAccount.getActiveUser(email);
+        if (userAccount != null) {
+            return userAccount.getAccessToken();
+        }
+
+        return null;
+    }
+
+   /*
+    Get email of the default user or null.
+     */
+    public static String getEmail() {
+        UserAccount userAccount = new UserAccount();
+        return userAccount.getActiveUser() != null ? userAccount.getActiveUser().getUserEmail(): null;
+    }
+
+    /*
+    Get access token for the first user in the file or null.
+
+    This is a utility method and can be called in places where it has already been made sure that file with correct
+    access token will be present.
+     */
+    public static String getAccessTokenByEmail() {
+        return getAccessToken(null);
+    }
+
+    /*
+    Get the user matching the given email.
+     */
+    public UserAccount getUser(String userEmail) {
+        return UserTable.getByEmail(userEmail);
+    }
+
+    /*
+     Get the access token of the active user from the map.
+     */
+    public String getActiveAccessToken() {
+        UserAccount userAccount = this.getActiveUser();
+        if (userAccount != null) {
+            return userAccount.accessToken;
+        }
+        return null;
+    }
+
+    /*
+    Get the active user from the map.
+     */
+    public UserAccount getActiveUser(String email) {
+        UserAccount userAccount = getUser(email);
+        if(userAccount != null){
+            return userAccount.isActive ? userAccount : null;
+        }
+        return null;
+    }
+
+    /*
+    Get the active user from the map.
+     */
+    public UserAccount getActiveUser() {
+        return UserTable.getActiveUser();
+    }
+
+    /*
+    Set user using Auth0 access token.
+
+    This will also make sure that this user is set to active and all other users are
+    set to in-active via is_active flag.
+     */
+    public void setActiveUser(String userEmail, String accessToken) {
+        UserAccount userAccount = getUser(userEmail);
+        if (userAccount == null) {
+            userAccount = new UserAccount(userEmail, accessToken);
+            // First mark all users in-active.
+            this.makeAllUsersInActive();
+            // Now mark the new user active.
+            userAccount.makeActive();
+            UserTable.insertNewUser(userAccount);
+        } else {
+            userAccount.setAccessToken(accessToken);
+            // First mark all users in-active.
+            this.makeAllUsersInActive();
+            // Now mark the new user active.
+            userAccount.makeActive();
+            UserTable.updateUser(userAccount);
+        }
+    }
+
+    /*
+    Make all user's in-active by setting `is_active` to false.
+     */
+    public void makeAllUsersInActive() {
+        UserTable.updateAllUsersInActive();
+    }
+
+    /*
+    Set user using IAM access and secret.
+     */
+    public void setActiveUser(String userEmail, String iamAccessKey, String iamSecretKey) {
+        UserAccount userAccount = getUser(userEmail);
+        if (userAccount == null) {
+            userAccount = new UserAccount(userEmail, iamAccessKey, iamSecretKey);
+            UserTable.insertNewUser(userAccount);
+        } else {
+            userAccount.setAccessKey(iamAccessKey);
+            userAccount.setSecretKey(iamSecretKey);
+            UserTable.updateUser(userAccount);
+        }
+    }
+
+}
diff --git a/src/main/java/org/intellij/sdk/codesync/state/StateUtils.java b/src/main/java/org/intellij/sdk/codesync/state/StateUtils.java
index e051cdff..48e51429 100644
--- a/src/main/java/org/intellij/sdk/codesync/state/StateUtils.java
+++ b/src/main/java/org/intellij/sdk/codesync/state/StateUtils.java
@@ -3,19 +3,16 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.intellij.sdk.codesync.exceptions.InvalidConfigFileError;
-import org.intellij.sdk.codesync.exceptions.InvalidYmlFileError;
 import org.intellij.sdk.codesync.files.ConfigFile;
 import org.intellij.sdk.codesync.files.ConfigRepo;
-import org.intellij.sdk.codesync.files.UserFile;
+import org.intellij.sdk.codesync.models.UserAccount;
 import org.intellij.sdk.codesync.utils.FileUtils;
 import org.intellij.sdk.codesync.utils.ProjectUtils;
 
-import java.io.FileNotFoundException;
 import java.util.HashMap;
 import java.util.Map;
 
 import static org.intellij.sdk.codesync.Constants.CONFIG_PATH;
-import static org.intellij.sdk.codesync.Constants.USER_FILE_PATH;
 
 public class StateUtils {
     private static final Map<String, PluginState> projectStateMap = new HashMap<>();
@@ -31,15 +28,11 @@ static public PluginState getGlobalState(){
     static public void populateGlobalState (Project project) {
         globalState.project = project;
 
-        try {
-            UserFile userFile = new UserFile(USER_FILE_PATH);
-            UserFile.User user = userFile.getActiveUser();
-            globalState.isAuthenticated = user != null;
-            if (user != null) {
-                globalState.userEmail = user.getUserEmail();
-            }
-        } catch (FileNotFoundException | InvalidYmlFileError error) {
-            globalState.isAuthenticated = false;
+        UserAccount userAccount = new UserAccount();
+        userAccount = userAccount.getActiveUser();
+        globalState.isAuthenticated = userAccount != null;
+        if (userAccount != null) {
+            globalState.userEmail = userAccount.getUserEmail();
         }
     }
 

From beddd92eedb71748968113667a5cbe0f3fba177e Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Thu, 9 Mar 2023 18:33:17 +0500
Subject: [PATCH 10/67] Undo changes for resolving conflict

---
 src/main/java/org/intellij/sdk/codesync/CodeSyncLogger.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/intellij/sdk/codesync/CodeSyncLogger.java b/src/main/java/org/intellij/sdk/codesync/CodeSyncLogger.java
index f5b86227..6b8b9ae1 100644
--- a/src/main/java/org/intellij/sdk/codesync/CodeSyncLogger.java
+++ b/src/main/java/org/intellij/sdk/codesync/CodeSyncLogger.java
@@ -115,6 +115,7 @@ private static void logEvent(String message, String type) {
     }
 
     public static void logEvent(String message, String userEmail, String type) {
+        LOGGER.log(Level.SEVERE, message);
         UserAccount userAccount = new UserAccount();
         logConsoleMessage(message, type);
 

From 9c73fa13259316d22a57df24fcb3e8e6245ab1b9 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Mon, 13 Mar 2023 08:50:50 +0500
Subject: [PATCH 11/67] Removed line missed earlier!

---
 src/main/java/org/intellij/sdk/codesync/CodeSyncLogger.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/intellij/sdk/codesync/CodeSyncLogger.java b/src/main/java/org/intellij/sdk/codesync/CodeSyncLogger.java
index 6b8b9ae1..f5b86227 100644
--- a/src/main/java/org/intellij/sdk/codesync/CodeSyncLogger.java
+++ b/src/main/java/org/intellij/sdk/codesync/CodeSyncLogger.java
@@ -115,7 +115,6 @@ private static void logEvent(String message, String type) {
     }
 
     public static void logEvent(String message, String userEmail, String type) {
-        LOGGER.log(Level.SEVERE, message);
         UserAccount userAccount = new UserAccount();
         logConsoleMessage(message, type);
 

From abcbbb2ab3ed6f8432834585a94c10551bcdcc21 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Thu, 16 Mar 2023 02:55:36 +0500
Subject: [PATCH 12/67] Resolving sonarCloud issues

---
 .../org/intellij/sdk/codesync/ProjectOpenCloseListener.java  | 1 +
 .../intellij/sdk/codesync/codeSyncSetup/CodeSyncSetup.java   | 2 +-
 .../org/intellij/sdk/codesync/{ => database}/Database.java   | 2 +-
 .../java/org/intellij/sdk/codesync/database/UserTable.java   | 5 ++---
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename src/main/java/org/intellij/sdk/codesync/{ => database}/Database.java (98%)

diff --git a/src/main/java/org/intellij/sdk/codesync/ProjectOpenCloseListener.java b/src/main/java/org/intellij/sdk/codesync/ProjectOpenCloseListener.java
index 8f57af91..af7b431a 100644
--- a/src/main/java/org/intellij/sdk/codesync/ProjectOpenCloseListener.java
+++ b/src/main/java/org/intellij/sdk/codesync/ProjectOpenCloseListener.java
@@ -22,6 +22,7 @@
 import org.apache.commons.codec.digest.DigestUtils;
 import org.intellij.sdk.codesync.alerts.ActivityAlerts;
 import org.intellij.sdk.codesync.codeSyncSetup.CodeSyncSetup;
+import org.intellij.sdk.codesync.database.Database;
 import org.intellij.sdk.codesync.exceptions.common.FileNotInModuleError;
 import org.intellij.sdk.codesync.locks.CodeSyncLock;
 import org.intellij.sdk.codesync.state.StateUtils;
diff --git a/src/main/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetup.java b/src/main/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetup.java
index a1f19bae..8c75c1ef 100644
--- a/src/main/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetup.java
+++ b/src/main/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetup.java
@@ -11,7 +11,7 @@
 import com.intellij.openapi.project.Project;
 import kotlin.Pair;
 import org.intellij.sdk.codesync.CodeSyncLogger;
-import org.intellij.sdk.codesync.Database;
+import org.intellij.sdk.codesync.database.Database;
 import org.intellij.sdk.codesync.NotificationManager;
 import org.intellij.sdk.codesync.Utils;
 import org.intellij.sdk.codesync.auth.CodeSyncAuthServer;
diff --git a/src/main/java/org/intellij/sdk/codesync/Database.java b/src/main/java/org/intellij/sdk/codesync/database/Database.java
similarity index 98%
rename from src/main/java/org/intellij/sdk/codesync/Database.java
rename to src/main/java/org/intellij/sdk/codesync/database/Database.java
index 91d6c9ef..c4bf02b0 100644
--- a/src/main/java/org/intellij/sdk/codesync/Database.java
+++ b/src/main/java/org/intellij/sdk/codesync/database/Database.java
@@ -1,4 +1,4 @@
-package org.intellij.sdk.codesync;
+package org.intellij.sdk.codesync.database;
 
 import org.intellij.sdk.codesync.database.migrations.MigrateUser;
 
diff --git a/src/main/java/org/intellij/sdk/codesync/database/UserTable.java b/src/main/java/org/intellij/sdk/codesync/database/UserTable.java
index 92a6580e..bd9f6f82 100644
--- a/src/main/java/org/intellij/sdk/codesync/database/UserTable.java
+++ b/src/main/java/org/intellij/sdk/codesync/database/UserTable.java
@@ -1,6 +1,5 @@
 package org.intellij.sdk.codesync.database;
 
-import org.intellij.sdk.codesync.Database;
 import org.intellij.sdk.codesync.models.UserAccount;
 
 import java.util.ArrayList;
@@ -40,7 +39,7 @@ public static UserAccount getActiveUser(){
             userAccount.setAccessKey((String) usersArray.get(0).getOrDefault("ACCESS_KEY", null));
             userAccount.setAccessToken((String) usersArray.get(0).getOrDefault("ACCESS_TOKEN", null));
             userAccount.setSecretKey((String) usersArray.get(0).getOrDefault("SECRET_KEY", null));
-            if((String) usersArray.get(0).getOrDefault("IS_ACTIVE", null) == "1"){
+            if(((String)usersArray.get(0).getOrDefault("IS_ACTIVE", null)).equals("1")){
                 userAccount.makeActive();
             }else {
                 userAccount.makeInActive();
@@ -61,7 +60,7 @@ public static UserAccount getByEmail(String email){
             userAccount.setAccessKey((String) usersArray.get(0).getOrDefault("ACCESS_KEY", null));
             userAccount.setAccessToken((String) usersArray.get(0).getOrDefault("ACCESS_TOKEN", null));
             userAccount.setSecretKey((String) usersArray.get(0).getOrDefault("SECRET_KEY", null));
-            if((String) usersArray.get(0).getOrDefault("IS_ACTIVE", null) == "1"){
+            if(((String)usersArray.get(0).getOrDefault("IS_ACTIVE", null)).equals("1")){
                 userAccount.makeActive();
             }else {
                 userAccount.makeInActive();

From 11a0985ba6ade654044b64cb63df3c82cec4099c Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Mon, 20 Mar 2023 23:59:33 +0500
Subject: [PATCH 13/67] Adding test cases!

---
 .../sdk/codesync/database/Database.java       | 20 +++-
 .../sdk/codesync/database/UserTable.java      | 10 +-
 .../sdk/codesync/models/UserAccount.java      |  1 -
 .../sdk/codesync/CodeSyncLoggerTest.kt        | 24 +++++
 .../intellij/sdk/codesync/HandleBufferTest.kt | 24 +++++
 .../sdk/codesync/PopulateBufferTest.kt        | 24 +++++
 .../sdk/codesync/alerts/ActivityAlertsTest.kt | 24 +++++
 .../sdk/codesync/auth/AuthActionTest.kt       | 24 +++++
 .../sdk/codesync/auth/AuthenticatorTest.kt    | 29 ++++++
 .../codeSyncSetup/CodeSyncSetupTest.kt        | 72 +++++++++++++++
 .../commands/ResumeCodeSyncCommandTest.kt     | 24 +++++
 .../sdk/codesync/database/DatabaseTest.kt     | 68 ++++++++++++++
 .../sdk/codesync/database/UserTableTest.kt    | 92 +++++++++++++++++++
 .../database/migration/MigrateUserTest.kt     | 24 +++++
 .../sdk/codesync/model/UserAccountTest.kt     | 41 +++++++++
 .../sdk/codesync/state/StateUtilsTest.kt      | 24 +++++
 16 files changed, 516 insertions(+), 9 deletions(-)
 create mode 100644 src/test/java/org/intellij/sdk/codesync/CodeSyncLoggerTest.kt
 create mode 100644 src/test/java/org/intellij/sdk/codesync/HandleBufferTest.kt
 create mode 100644 src/test/java/org/intellij/sdk/codesync/PopulateBufferTest.kt
 create mode 100644 src/test/java/org/intellij/sdk/codesync/alerts/ActivityAlertsTest.kt
 create mode 100644 src/test/java/org/intellij/sdk/codesync/auth/AuthActionTest.kt
 create mode 100644 src/test/java/org/intellij/sdk/codesync/auth/AuthenticatorTest.kt
 create mode 100644 src/test/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetupTest.kt
 create mode 100644 src/test/java/org/intellij/sdk/codesync/commands/ResumeCodeSyncCommandTest.kt
 create mode 100644 src/test/java/org/intellij/sdk/codesync/database/DatabaseTest.kt
 create mode 100644 src/test/java/org/intellij/sdk/codesync/database/UserTableTest.kt
 create mode 100644 src/test/java/org/intellij/sdk/codesync/database/migration/MigrateUserTest.kt
 create mode 100644 src/test/java/org/intellij/sdk/codesync/model/UserAccountTest.kt
 create mode 100644 src/test/java/org/intellij/sdk/codesync/state/StateUtilsTest.kt

diff --git a/src/main/java/org/intellij/sdk/codesync/database/Database.java b/src/main/java/org/intellij/sdk/codesync/database/Database.java
index c4bf02b0..48ab2964 100644
--- a/src/main/java/org/intellij/sdk/codesync/database/Database.java
+++ b/src/main/java/org/intellij/sdk/codesync/database/Database.java
@@ -1,5 +1,6 @@
 package org.intellij.sdk.codesync.database;
 
+import com.intellij.openapi.application.ApplicationManager;
 import org.intellij.sdk.codesync.database.migrations.MigrateUser;
 
 import java.io.File;
@@ -15,6 +16,8 @@ public class Database {
 
     public static void initiate() {
 
+
+
         try{
             File file = new File(DATABASE_PATH);
             if(!file.exists()){
@@ -36,6 +39,16 @@ public static void initiate() {
         }
     }
 
+    public static void initiate(String connectionString) {
+        try{
+            Class.forName("org.sqlite.JDBC");
+            connection = DriverManager.getConnection(connectionString);
+            executeUpdate(CREATE_USER_TABLE_QUERY);
+        }catch (Exception exception) {
+            System.out.println("Database connection error: " + exception.getMessage());
+        }
+    }
+
     /*
     This method accepts a SELECT query and then using
     executeQuery method fetch rows from database.
@@ -44,7 +57,7 @@ public static void initiate() {
 
     Then every row stored as a hashmap is added to arraylist which is returned as a list of rows.
      */
-    public static ArrayList runQuery(String query){
+    public static ArrayList<HashMap<String, String>> runQuery(String query){
         try {
             Statement statement = connection.createStatement();
             ResultSet rs = statement.executeQuery(query);
@@ -69,13 +82,14 @@ public static ArrayList runQuery(String query){
         return null;
     }
 
-    public static void executeUpdate(String query){
+    public static int executeUpdate(String query){
         try {
             Statement statement = connection.createStatement();
-            statement.executeUpdate(query);
+            return statement.executeUpdate(query);
         } catch (Exception exception) {
             System.out.println("Database error: " + exception.getMessage());
         }
+        return -1;
     }
 
     public static void disconnect(){
diff --git a/src/main/java/org/intellij/sdk/codesync/database/UserTable.java b/src/main/java/org/intellij/sdk/codesync/database/UserTable.java
index bd9f6f82..2548758a 100644
--- a/src/main/java/org/intellij/sdk/codesync/database/UserTable.java
+++ b/src/main/java/org/intellij/sdk/codesync/database/UserTable.java
@@ -19,10 +19,10 @@ public static void insertNewUser(UserAccount userAccount){
         Database.executeUpdate(query);
     }
 
-    public static void updateUser(UserAccount userAccount){
+    public static int updateUser(UserAccount userAccount){
         setValues(userAccount);
         String query = String.format("UPDATE user SET access_token = %s, secret_key = %s, access_key = %s, is_active = %d WHERE email = %s", access_token, secret_key, access_key, is_active, email);
-        Database.executeUpdate(query);
+        return Database.executeUpdate(query);
     }
 
     public static void updateAllUsersInActive(){
@@ -32,7 +32,7 @@ public static void updateAllUsersInActive(){
 
     public static UserAccount getActiveUser(){
         String query = "SELECT * FROM user WHERE is_active = 1";
-        ArrayList<HashMap<String, Object>> usersArray = Database.runQuery(query);
+        ArrayList<HashMap<String, String>> usersArray = Database.runQuery(query);
 
         if(usersArray.size() > 0){
             UserAccount userAccount = new UserAccount((String) usersArray.get(0).get("EMAIL"));
@@ -53,13 +53,13 @@ public static UserAccount getActiveUser(){
 
     public static UserAccount getByEmail(String email){
         String query = String.format("SELECT * FROM user WHERE email = '%s'", email);
-        ArrayList<HashMap<String, Object>> usersArray = Database.runQuery(query);
+        ArrayList<HashMap<String, String>> usersArray = Database.runQuery(query);
 
         if(usersArray.size() > 0){
             UserAccount userAccount = new UserAccount((String) usersArray.get(0).get("EMAIL"));
-            userAccount.setAccessKey((String) usersArray.get(0).getOrDefault("ACCESS_KEY", null));
             userAccount.setAccessToken((String) usersArray.get(0).getOrDefault("ACCESS_TOKEN", null));
             userAccount.setSecretKey((String) usersArray.get(0).getOrDefault("SECRET_KEY", null));
+            userAccount.setAccessKey((String) usersArray.get(0).getOrDefault("ACCESS_KEY", null));
             if(((String)usersArray.get(0).getOrDefault("IS_ACTIVE", null)).equals("1")){
                 userAccount.makeActive();
             }else {
diff --git a/src/main/java/org/intellij/sdk/codesync/models/UserAccount.java b/src/main/java/org/intellij/sdk/codesync/models/UserAccount.java
index 956df1a6..2b7aee9c 100644
--- a/src/main/java/org/intellij/sdk/codesync/models/UserAccount.java
+++ b/src/main/java/org/intellij/sdk/codesync/models/UserAccount.java
@@ -8,7 +8,6 @@
 public class UserAccount {
 
     public UserAccount(){}
-
     String userEmail, accessKey = null, secretKey = null, accessToken = null;
     Boolean isActive = false;
 
diff --git a/src/test/java/org/intellij/sdk/codesync/CodeSyncLoggerTest.kt b/src/test/java/org/intellij/sdk/codesync/CodeSyncLoggerTest.kt
new file mode 100644
index 00000000..c59cf7c2
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/CodeSyncLoggerTest.kt
@@ -0,0 +1,24 @@
+package org.intellij.sdk.codesync
+
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+
+class CodeSyncLoggerTest {
+
+    @BeforeEach
+    fun before(){
+
+    }
+
+    @AfterEach
+    fun after(){
+
+    }
+
+    @Test
+    fun validateLogEvent(){
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/HandleBufferTest.kt b/src/test/java/org/intellij/sdk/codesync/HandleBufferTest.kt
new file mode 100644
index 00000000..d242e068
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/HandleBufferTest.kt
@@ -0,0 +1,24 @@
+package org.intellij.sdk.codesync
+
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+
+class HandleBufferTest {
+
+    @BeforeEach
+    fun before(){
+
+    }
+
+    @AfterEach
+    fun after(){
+
+    }
+
+    @Test
+    fun validateHandleBuffer(){
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/PopulateBufferTest.kt b/src/test/java/org/intellij/sdk/codesync/PopulateBufferTest.kt
new file mode 100644
index 00000000..6eabc073
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/PopulateBufferTest.kt
@@ -0,0 +1,24 @@
+package org.intellij.sdk.codesync
+
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+
+class PopulateBufferTest {
+
+    @BeforeEach
+    fun before(){
+
+    }
+
+    @AfterEach
+    fun after(){
+
+    }
+
+    @Test
+    fun validateDetectBranchChange(){
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/alerts/ActivityAlertsTest.kt b/src/test/java/org/intellij/sdk/codesync/alerts/ActivityAlertsTest.kt
new file mode 100644
index 00000000..20b8fc57
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/alerts/ActivityAlertsTest.kt
@@ -0,0 +1,24 @@
+package org.intellij.sdk.codesync.alerts
+
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+
+class ActivityAlertsTest {
+
+    @BeforeEach
+    fun before(){
+
+    }
+
+    @AfterEach
+    fun after(){
+
+    }
+
+    @Test
+    fun validateShowActivityAlert(){
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/auth/AuthActionTest.kt b/src/test/java/org/intellij/sdk/codesync/auth/AuthActionTest.kt
new file mode 100644
index 00000000..542d6f34
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/auth/AuthActionTest.kt
@@ -0,0 +1,24 @@
+package org.intellij.sdk.codesync.auth
+
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+
+class AuthActionTest {
+
+    @BeforeEach
+    fun before(){
+
+    }
+
+    @AfterEach
+    fun after(){
+
+    }
+
+    @Test
+    fun validateActionPerformed(){
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/auth/AuthenticatorTest.kt b/src/test/java/org/intellij/sdk/codesync/auth/AuthenticatorTest.kt
new file mode 100644
index 00000000..0b379ebf
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/auth/AuthenticatorTest.kt
@@ -0,0 +1,29 @@
+package org.intellij.sdk.codesync.auth
+
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+
+class AuthenticatorTest {
+
+    @Test
+    fun validateCreateUser(){
+
+        @BeforeEach
+        fun before(){
+
+        }
+
+        @AfterEach
+        fun after(){
+
+        }
+
+        @Test
+        fun validateCreateUser(){
+
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetupTest.kt b/src/test/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetupTest.kt
new file mode 100644
index 00000000..78491594
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetupTest.kt
@@ -0,0 +1,72 @@
+package org.intellij.sdk.codesync.codeSyncSetup
+
+import org.intellij.sdk.codesync.Constants
+import org.intellij.sdk.codesync.database.Database
+import org.jsoup.helper.Validate
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import java.io.File
+import java.util.HashMap
+import kotlin.test.assertEquals
+
+class CodeSyncSetupTest {
+
+    var directory_path = ""
+    var database_file = ""
+
+    @BeforeEach
+    fun before() {
+        //1. Generate random base repo path
+        directory_path = System.getProperty("user.dir") + "\\src\\test\\java\\test_data"
+        database_file = "\\test.db"
+        //2. Create directory
+        var file = File(directory_path)
+        file.mkdir()
+
+        //3. Connect to db created in step (2) above repo
+        var connectionString = "jdbc:sqlite:" + directory_path + database_file
+        Database.initiate(connectionString)
+
+        //4. Create user table
+        Database.executeUpdate(Constants.CREATE_USER_TABLE_QUERY)
+    }
+
+    @AfterEach
+    fun after() {
+        //1. Disconnect database
+        Database.disconnect()
+
+        //2. Remove base repo
+        var file = File(directory_path + database_file)
+        file.delete()
+        file = File(directory_path)
+        file.delete()
+    }
+
+    @Test
+    fun validateSaveIamUserTest(){
+        CodeSyncSetup.saveIamUser("sample@gmail.com", "ACCESS", "SECRET")
+        var resultSet = Database.runQuery("SELECT * FROM user")
+        var row : HashMap<String, String> = resultSet.get(0)
+        assertEquals("sample@gmail.com", row["EMAIL"])
+        assertEquals("ACCESS", row["ACCESS_KEY"])
+        assertEquals("SECRET", row["SECRET_KEY"])
+    }
+
+    @Test
+    fun validateDisconnectRepo(){
+
+    }
+
+    @Test
+    fun validateCheckUserAccess(){
+
+    }
+
+    @Test
+    fun validateUploadRepo(){
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/commands/ResumeCodeSyncCommandTest.kt b/src/test/java/org/intellij/sdk/codesync/commands/ResumeCodeSyncCommandTest.kt
new file mode 100644
index 00000000..467d2ceb
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/commands/ResumeCodeSyncCommandTest.kt
@@ -0,0 +1,24 @@
+package org.intellij.sdk.codesync.commands
+
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+
+class ResumeCodeSyncCommandTest {
+
+    @BeforeEach
+    fun before(){
+
+    }
+
+    @AfterEach
+    fun after(){
+
+    }
+
+    @Test
+    fun validateExecute(){
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/database/DatabaseTest.kt b/src/test/java/org/intellij/sdk/codesync/database/DatabaseTest.kt
new file mode 100644
index 00000000..b81cc49d
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/database/DatabaseTest.kt
@@ -0,0 +1,68 @@
+package org.intellij.sdk.codesync.database
+
+import org.intellij.sdk.codesync.Constants.CREATE_USER_TABLE_QUERY
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import java.io.File
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+
+
+class DatabaseTest {
+
+    var directory_path = ""
+    var database_file = ""
+
+    @BeforeEach
+    fun before() {
+        //1. Generate random base repo path
+        directory_path = System.getProperty("user.dir") + "\\src\\test\\java\\test_data"
+        database_file = "\\test.db"
+        //2. Create directory
+        var file = File(directory_path)
+        file.mkdir()
+
+        //3. Connect to db created in step (2) above repo
+        var connectionString = "jdbc:sqlite:" + directory_path + database_file
+        Database.initiate(connectionString)
+
+        //4. Create user table
+        Database.executeUpdate(CREATE_USER_TABLE_QUERY)
+    }
+
+    @AfterEach
+    fun after() {
+        //1. Disconnect database
+        Database.disconnect()
+
+        //2. Remove base repo
+        var file = File(directory_path + database_file)
+        file.delete()
+        file = File(directory_path)
+        file.delete()
+    }
+
+    @Test
+    fun validateRunQuery(){
+        var query = "SELECT * FROM user"
+        var resultSet = Database.runQuery(query)
+
+        assertNotNull(resultSet, "Table exists.")
+        assertEquals(0, resultSet.size, "Zero rows.")
+
+        var insertQuery = "INSERT INTO user VALUES('Ahmed', 'ASDFC', null, null, 1)"
+        Database.executeUpdate(insertQuery)
+        resultSet = Database.runQuery(query)
+
+        var row : HashMap<String, String> = resultSet.get(0)
+        assertEquals(1, resultSet.size, "1 row exist.")
+        assertEquals("Ahmed", row["EMAIL"])
+        assertEquals("ASDFC", row["ACCESS_TOKEN"])
+        assertNull(row["SECRET_KEY"])
+        assertNull(row["ACCESS_KEY"])
+        assertEquals(1, Integer.parseInt(row["IS_ACTIVE"]))
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/database/UserTableTest.kt b/src/test/java/org/intellij/sdk/codesync/database/UserTableTest.kt
new file mode 100644
index 00000000..1bc945c1
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/database/UserTableTest.kt
@@ -0,0 +1,92 @@
+package org.intellij.sdk.codesync.database
+
+import org.intellij.sdk.codesync.Constants
+import org.intellij.sdk.codesync.models.UserAccount
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import java.io.File
+import java.util.HashMap
+import kotlin.test.assertEquals
+import kotlin.test.assertNull
+
+class UserTableTest {
+
+    var directory_path = ""
+    var database_file = ""
+
+    @BeforeEach
+    fun before() {
+        //1. Generate random base repo path
+        directory_path = System.getProperty("user.dir") + "\\src\\test\\java\\test_data"
+        database_file = "\\test.db"
+        //2. Create directory
+        var file = File(directory_path)
+        file.mkdir()
+
+        //3. Connect to db created in step (2) above repo
+        var connectionString = "jdbc:sqlite:" + directory_path + database_file
+        Database.initiate(connectionString)
+
+        //4. Create user table
+        Database.executeUpdate(Constants.CREATE_USER_TABLE_QUERY)
+    }
+
+    @AfterEach
+    fun after() {
+        //1. Disconnect database
+        Database.disconnect()
+
+        //2. Remove base repo
+        var file = File(directory_path + database_file)
+        file.delete()
+        file = File(directory_path)
+        file.delete()
+    }
+
+    @Test
+    fun validateInsertNewUser(){
+        var userAccount = UserAccount("sample@gmail.com", "ACCESS_TOKEN")
+        UserTable.insertNewUser(userAccount)
+        var resultSet = Database.runQuery("SELECT * FROM user")
+        var row : HashMap<String, String> = resultSet.get(0)
+        assertEquals("sample@gmail.com", row["EMAIL"])
+        assertEquals("ACCESS_TOKEN", row["ACCESS_TOKEN"])
+        assertNull(row["ACCESS_KEY"])
+        assertNull(row["SECRET_KEY"])
+    }
+
+    @Test
+    fun validateUpdateUser(){
+        var userAccount = UserAccount("sample@gmail.com", "access token")
+        UserTable.insertNewUser(userAccount)
+
+        userAccount.setSecretKey("secret key")
+        userAccount.setAccessKey("access key")
+        println("Change update: " + UserTable.updateUser(userAccount))
+
+        var resultSet = Database.runQuery("SELECT * FROM user")
+        var row : HashMap<String, String> = resultSet.get(0)
+        assertEquals("sample@gmail.com", row["EMAIL"])
+        assertEquals("access token", row["ACCESS_TOKEN"])
+        assertEquals("access key", row["ACCESS_KEY"])
+        assertEquals("secret key", row["SECRET_KEY"])
+    }
+
+    @Test
+    fun validateGetByEmail(){
+        var userAccount = UserTable.getByEmail("sample@gmail.com")
+        assertNull(userAccount)
+    }
+
+    @Test
+    fun validateGetActiveUser(){
+
+    }
+
+    @Test
+    fun validateSetValues(){
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/database/migration/MigrateUserTest.kt b/src/test/java/org/intellij/sdk/codesync/database/migration/MigrateUserTest.kt
new file mode 100644
index 00000000..19eb04bd
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/database/migration/MigrateUserTest.kt
@@ -0,0 +1,24 @@
+package org.intellij.sdk.codesync.database.migration
+
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+
+class MigrateUserTest {
+
+    @BeforeEach
+    fun before(){
+
+    }
+
+    @AfterEach
+    fun after(){
+
+    }
+
+    @Test
+    fun validateLoadYmlContent(){
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/model/UserAccountTest.kt b/src/test/java/org/intellij/sdk/codesync/model/UserAccountTest.kt
new file mode 100644
index 00000000..e7b3c781
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/model/UserAccountTest.kt
@@ -0,0 +1,41 @@
+package org.intellij.sdk.codesync.model
+
+import org.intellij.sdk.codesync.models.UserAccount
+import org.junit.jupiter.api.Test
+import java.util.*
+import kotlin.test.assertNull
+
+class UserAccountTest {
+
+    @Test
+    fun validatedGetUser(){
+        var userAccount = UserAccount()
+        assertNull(userAccount.getUser("gulahmed2@gaml.com"))
+    }
+
+    @Test
+    fun validateGetAccessToken(){
+
+    }
+
+    @Test
+    fun validateGetEmail(){
+
+    }
+
+    @Test
+    fun validateGetAccessTokenByEmail(){
+
+    }
+
+    @Test
+    fun validateGetActiveAccessToken(){
+
+    }
+
+    @Test
+    fun validateSetActiveUser(){
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/state/StateUtilsTest.kt b/src/test/java/org/intellij/sdk/codesync/state/StateUtilsTest.kt
new file mode 100644
index 00000000..242bc3cb
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/state/StateUtilsTest.kt
@@ -0,0 +1,24 @@
+package org.intellij.sdk.codesync.state
+
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+
+class StateUtilsTest {
+
+    @BeforeEach
+    fun before(){
+
+    }
+
+    @AfterEach
+    fun after(){
+
+    }
+
+    @Test
+    fun validatePopulateGlobalState(){
+
+    }
+
+}
\ No newline at end of file

From 8d49683d5bb34cc7a6f7d8c0b6bf37993a803683 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Tue, 21 Mar 2023 17:24:45 +0500
Subject: [PATCH 14/67] Refactoring and creating Queries class and Helper class
 for test constants.

---
 .../sdk/codesync/database/Database.java       | 12 ++--
 .../sdk/codesync/database/UserTable.java      |  9 ++-
 .../intellij/sdk/codesync/utils/Queries.java  | 47 +++++++++++++
 .../java/org/intellij/sdk/codesync/Helper.kt  | 13 ++++
 .../codeSyncSetup/CodeSyncSetupTest.kt        | 32 ++++-----
 .../sdk/codesync/database/DatabaseTest.kt     | 46 ++++++-------
 .../sdk/codesync/database/UserTableTest.kt    | 68 ++++++++++++-------
 7 files changed, 152 insertions(+), 75 deletions(-)
 create mode 100644 src/main/java/org/intellij/sdk/codesync/utils/Queries.java
 create mode 100644 src/test/java/org/intellij/sdk/codesync/Helper.kt

diff --git a/src/main/java/org/intellij/sdk/codesync/database/Database.java b/src/main/java/org/intellij/sdk/codesync/database/Database.java
index 48ab2964..eccba5e5 100644
--- a/src/main/java/org/intellij/sdk/codesync/database/Database.java
+++ b/src/main/java/org/intellij/sdk/codesync/database/Database.java
@@ -2,6 +2,7 @@
 
 import com.intellij.openapi.application.ApplicationManager;
 import org.intellij.sdk.codesync.database.migrations.MigrateUser;
+import org.intellij.sdk.codesync.utils.Queries;
 
 import java.io.File;
 import java.sql.*;
@@ -15,23 +16,20 @@ public class Database {
     private static Connection connection = null;
 
     public static void initiate() {
-
-
-
         try{
             File file = new File(DATABASE_PATH);
             if(!file.exists()){
                 Class.forName("org.sqlite.JDBC");
                 String connectionString = CONNECTION_STRING;
                 connection = DriverManager.getConnection(connectionString);
-                executeUpdate(CREATE_USER_TABLE_QUERY);
+                executeUpdate(Queries.CREATE_USER_TABLE);
                 MigrateUser migrateUser = new MigrateUser();
                 migrateUser.migrateData();
             }else {
                 Class.forName("org.sqlite.JDBC");
                 String connectionString = CONNECTION_STRING;
                 connection = DriverManager.getConnection(connectionString);
-                executeUpdate(CREATE_USER_TABLE_QUERY);
+                executeUpdate(Queries.CREATE_USER_TABLE);
             }
 
         }catch (Exception exception) {
@@ -43,7 +41,6 @@ public static void initiate(String connectionString) {
         try{
             Class.forName("org.sqlite.JDBC");
             connection = DriverManager.getConnection(connectionString);
-            executeUpdate(CREATE_USER_TABLE_QUERY);
         }catch (Exception exception) {
             System.out.println("Database connection error: " + exception.getMessage());
         }
@@ -73,6 +70,9 @@ public static ArrayList<HashMap<String, String>> runQuery(String query){
                 dataSet.add(row);
             }
 
+            if(dataSet.size() == 0)
+                return null;
+
             return dataSet;
 
         } catch (Exception exception) {
diff --git a/src/main/java/org/intellij/sdk/codesync/database/UserTable.java b/src/main/java/org/intellij/sdk/codesync/database/UserTable.java
index 2548758a..c2f63279 100644
--- a/src/main/java/org/intellij/sdk/codesync/database/UserTable.java
+++ b/src/main/java/org/intellij/sdk/codesync/database/UserTable.java
@@ -1,6 +1,7 @@
 package org.intellij.sdk.codesync.database;
 
 import org.intellij.sdk.codesync.models.UserAccount;
+import org.intellij.sdk.codesync.utils.Queries;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -31,8 +32,7 @@ public static void updateAllUsersInActive(){
     }
 
     public static UserAccount getActiveUser(){
-        String query = "SELECT * FROM user WHERE is_active = 1";
-        ArrayList<HashMap<String, String>> usersArray = Database.runQuery(query);
+        ArrayList<HashMap<String, String>> usersArray = Database.runQuery(Queries.User.get_by_active_status(true));
 
         if(usersArray.size() > 0){
             UserAccount userAccount = new UserAccount((String) usersArray.get(0).get("EMAIL"));
@@ -52,10 +52,9 @@ public static UserAccount getActiveUser(){
     }
 
     public static UserAccount getByEmail(String email){
-        String query = String.format("SELECT * FROM user WHERE email = '%s'", email);
-        ArrayList<HashMap<String, String>> usersArray = Database.runQuery(query);
+        ArrayList<HashMap<String, String>> usersArray = Database.runQuery(Queries.User.get_by_email(email));
 
-        if(usersArray.size() > 0){
+        if(usersArray != null){
             UserAccount userAccount = new UserAccount((String) usersArray.get(0).get("EMAIL"));
             userAccount.setAccessToken((String) usersArray.get(0).getOrDefault("ACCESS_TOKEN", null));
             userAccount.setSecretKey((String) usersArray.get(0).getOrDefault("SECRET_KEY", null));
diff --git a/src/main/java/org/intellij/sdk/codesync/utils/Queries.java b/src/main/java/org/intellij/sdk/codesync/utils/Queries.java
new file mode 100644
index 00000000..6ac3b325
--- /dev/null
+++ b/src/main/java/org/intellij/sdk/codesync/utils/Queries.java
@@ -0,0 +1,47 @@
+package org.intellij.sdk.codesync.utils;
+
+import javax.annotation.Nullable;
+
+public class Queries {
+
+    public static final String CREATE_USER_TABLE = "CREATE TABLE IF NOT EXISTS user (EMAIL TEXT PRIMARY KEY, ACCESS_TOKEN TEXT, SECRET_KEY TEXT, ACCESS_KEY TEXT, IS_ACTIVE INT)";
+    public static class User{
+
+        public static final String TABLE_EXIST = Queries.table_exist("user");
+        public static String get_all(){
+            return "SELECT * FROM user";
+        }
+
+        public static String get_by_email(String email){
+            return String.format("SELECT * FROM user WHERE email='%s'", email);
+        }
+
+        public static String get_by_active_status(boolean isActive){
+            int is_active = isActive? 1 : 0;
+            return String.format("SELECT * FROM user WHERE is_active=%s", is_active);
+        }
+
+        public static String insert(String email, String access_token, String secret_key, String access_key, boolean status){
+            int is_active;
+            email = email == null? "NULL" : String.format("'%s'", email);
+            access_token = access_token == null? "NULL" : String.format("'%s'", access_token);
+            secret_key = secret_key == null? "NULL" : String.format("'%s'", secret_key);
+            access_key = access_key == null? "NULL" : String.format("'%s'", access_key);
+
+            if(status){
+                is_active = status? 1 : 0;
+            }else{
+                is_active = 0;
+            }
+
+            return String.format("INSERT INTO user VALUES(%s, %s, %s, %s, %d)", email, access_token, secret_key, access_key, is_active);
+
+        }
+
+    }
+
+    public static String table_exist(String table_name){
+        return String.format("SELECT name FROM sqlite_master WHERE type='table' AND name='%s'", table_name);
+    }
+
+}
diff --git a/src/test/java/org/intellij/sdk/codesync/Helper.kt b/src/test/java/org/intellij/sdk/codesync/Helper.kt
new file mode 100644
index 00000000..a11ec1d7
--- /dev/null
+++ b/src/test/java/org/intellij/sdk/codesync/Helper.kt
@@ -0,0 +1,13 @@
+package org.intellij.sdk.codesync
+
+class Helper {
+
+
+
+    companion object {
+        val DIRECTORY_PATH = System.getProperty("user.dir") + "\\src\\test\\java\\test_data"
+        val DATABASE_FILE = "\\file.db"
+        val CONNECTION_STRING = "jdbc:sqlite:" + DIRECTORY_PATH + DATABASE_FILE
+    }
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetupTest.kt b/src/test/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetupTest.kt
index 78491594..4cb1162a 100644
--- a/src/test/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetupTest.kt
+++ b/src/test/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetupTest.kt
@@ -1,35 +1,30 @@
 package org.intellij.sdk.codesync.codeSyncSetup
 
-import org.intellij.sdk.codesync.Constants
+import org.intellij.sdk.codesync.Helper
 import org.intellij.sdk.codesync.database.Database
-import org.jsoup.helper.Validate
+import org.intellij.sdk.codesync.utils.Queries
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import java.io.File
-import java.util.HashMap
 import kotlin.test.assertEquals
 
 class CodeSyncSetupTest {
 
-    var directory_path = ""
-    var database_file = ""
-
     @BeforeEach
     fun before() {
-        //1. Generate random base repo path
-        directory_path = System.getProperty("user.dir") + "\\src\\test\\java\\test_data"
-        database_file = "\\test.db"
         //2. Create directory
-        var file = File(directory_path)
+        var file = File(Helper.DIRECTORY_PATH)
         file.mkdir()
 
         //3. Connect to db created in step (2) above repo
-        var connectionString = "jdbc:sqlite:" + directory_path + database_file
-        Database.initiate(connectionString)
+        Database.initiate(Helper.CONNECTION_STRING)
 
         //4. Create user table
-        Database.executeUpdate(Constants.CREATE_USER_TABLE_QUERY)
+        Database.executeUpdate(Queries.CREATE_USER_TABLE)
+
+        //5. Add dummy user
+        Database.executeUpdate(Queries.User.insert("Dummy@gmail.com","ASDFC", null, null, false));
     }
 
     @AfterEach
@@ -38,18 +33,19 @@ class CodeSyncSetupTest {
         Database.disconnect()
 
         //2. Remove base repo
-        var file = File(directory_path + database_file)
+        var file = File(Helper.DIRECTORY_PATH + Helper.DATABASE_FILE)
         file.delete()
-        file = File(directory_path)
+        file = File(Helper.DIRECTORY_PATH)
         file.delete()
     }
 
     @Test
     fun validateSaveIamUserTest(){
-        CodeSyncSetup.saveIamUser("sample@gmail.com", "ACCESS", "SECRET")
-        var resultSet = Database.runQuery("SELECT * FROM user")
+        var email = "sample@gmail.com"
+        CodeSyncSetup.saveIamUser(email, "ACCESS", "SECRET")
+        var resultSet = Database.runQuery(Queries.User.get_by_email(email))
         var row : HashMap<String, String> = resultSet.get(0)
-        assertEquals("sample@gmail.com", row["EMAIL"])
+        assertEquals(email, row["EMAIL"])
         assertEquals("ACCESS", row["ACCESS_KEY"])
         assertEquals("SECRET", row["SECRET_KEY"])
     }
diff --git a/src/test/java/org/intellij/sdk/codesync/database/DatabaseTest.kt b/src/test/java/org/intellij/sdk/codesync/database/DatabaseTest.kt
index b81cc49d..d9f65be8 100644
--- a/src/test/java/org/intellij/sdk/codesync/database/DatabaseTest.kt
+++ b/src/test/java/org/intellij/sdk/codesync/database/DatabaseTest.kt
@@ -1,6 +1,7 @@
 package org.intellij.sdk.codesync.database
 
-import org.intellij.sdk.codesync.Constants.CREATE_USER_TABLE_QUERY
+import org.intellij.sdk.codesync.Helper
+import org.intellij.sdk.codesync.utils.Queries
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
@@ -12,24 +13,20 @@ import kotlin.test.assertNull
 
 class DatabaseTest {
 
-    var directory_path = ""
-    var database_file = ""
-
     @BeforeEach
     fun before() {
-        //1. Generate random base repo path
-        directory_path = System.getProperty("user.dir") + "\\src\\test\\java\\test_data"
-        database_file = "\\test.db"
         //2. Create directory
-        var file = File(directory_path)
+        var file = File(Helper.DIRECTORY_PATH)
         file.mkdir()
 
         //3. Connect to db created in step (2) above repo
-        var connectionString = "jdbc:sqlite:" + directory_path + database_file
-        Database.initiate(connectionString)
+        Database.initiate(Helper.CONNECTION_STRING)
 
         //4. Create user table
-        Database.executeUpdate(CREATE_USER_TABLE_QUERY)
+        Database.executeUpdate(Queries.CREATE_USER_TABLE)
+
+        //5. Add dummy user
+        Database.executeUpdate(Queries.User.insert("Dummy@gmail.com","ASDFC", null, null, false));
     }
 
     @AfterEach
@@ -38,31 +35,34 @@ class DatabaseTest {
         Database.disconnect()
 
         //2. Remove base repo
-        var file = File(directory_path + database_file)
+        var file = File(Helper.DIRECTORY_PATH + Helper.DATABASE_FILE)
         file.delete()
-        file = File(directory_path)
+        file = File(Helper.DIRECTORY_PATH)
         file.delete()
     }
 
     @Test
     fun validateRunQuery(){
-        var query = "SELECT * FROM user"
-        var resultSet = Database.runQuery(query)
-
-        assertNotNull(resultSet, "Table exists.")
-        assertEquals(0, resultSet.size, "Zero rows.")
 
-        var insertQuery = "INSERT INTO user VALUES('Ahmed', 'ASDFC', null, null, 1)"
-        Database.executeUpdate(insertQuery)
-        resultSet = Database.runQuery(query)
+        var email = "sample@gmail.com"
+        var access_token = "ACCESS TOKEN"
+        Database.executeUpdate(Queries.User.insert(email, access_token, null, null, true));
+        var resultSet = Database.runQuery(Queries.User.get_by_email(email))
 
         var row : HashMap<String, String> = resultSet.get(0)
         assertEquals(1, resultSet.size, "1 row exist.")
-        assertEquals("Ahmed", row["EMAIL"])
-        assertEquals("ASDFC", row["ACCESS_TOKEN"])
+        assertEquals(email, row["EMAIL"])
+        assertEquals(access_token, row["ACCESS_TOKEN"])
         assertNull(row["SECRET_KEY"])
         assertNull(row["ACCESS_KEY"])
         assertEquals(1, Integer.parseInt(row["IS_ACTIVE"]))
     }
 
+    @Test
+    fun userTableCreation(){
+        var resultSet = Database.runQuery(Queries.User.TABLE_EXIST)
+        assertNotNull(resultSet)
+        assertEquals("user", resultSet[0].get("name"))
+    }
+
 }
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/database/UserTableTest.kt b/src/test/java/org/intellij/sdk/codesync/database/UserTableTest.kt
index 1bc945c1..c3f8cd47 100644
--- a/src/test/java/org/intellij/sdk/codesync/database/UserTableTest.kt
+++ b/src/test/java/org/intellij/sdk/codesync/database/UserTableTest.kt
@@ -1,35 +1,32 @@
 package org.intellij.sdk.codesync.database
 
-import org.intellij.sdk.codesync.Constants
+import org.intellij.sdk.codesync.Helper
 import org.intellij.sdk.codesync.models.UserAccount
+import org.intellij.sdk.codesync.utils.Queries
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import java.io.File
-import java.util.HashMap
 import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
 import kotlin.test.assertNull
 
 class UserTableTest {
 
-    var directory_path = ""
-    var database_file = ""
-
     @BeforeEach
     fun before() {
-        //1. Generate random base repo path
-        directory_path = System.getProperty("user.dir") + "\\src\\test\\java\\test_data"
-        database_file = "\\test.db"
         //2. Create directory
-        var file = File(directory_path)
+        var file = File(Helper.DIRECTORY_PATH)
         file.mkdir()
 
         //3. Connect to db created in step (2) above repo
-        var connectionString = "jdbc:sqlite:" + directory_path + database_file
-        Database.initiate(connectionString)
+        Database.initiate(Helper.CONNECTION_STRING)
 
         //4. Create user table
-        Database.executeUpdate(Constants.CREATE_USER_TABLE_QUERY)
+        Database.executeUpdate(Queries.CREATE_USER_TABLE)
+
+        //5. Add dummy user
+        Database.executeUpdate(Queries.User.insert("Dummy@gmail.com","ASDFC", null, null, false));
     }
 
     @AfterEach
@@ -38,36 +35,49 @@ class UserTableTest {
         Database.disconnect()
 
         //2. Remove base repo
-        var file = File(directory_path + database_file)
+        var file = File(Helper.DIRECTORY_PATH + Helper.DATABASE_FILE)
         file.delete()
-        file = File(directory_path)
+        file = File(Helper.DIRECTORY_PATH)
         file.delete()
     }
 
     @Test
     fun validateInsertNewUser(){
-        var userAccount = UserAccount("sample@gmail.com", "ACCESS_TOKEN")
+        var email = "sample@gmail.com"
+
+        var userAccount = UserAccount(email, "ACCESS_TOKEN")
         UserTable.insertNewUser(userAccount)
-        var resultSet = Database.runQuery("SELECT * FROM user")
+
+        var resultSet = Database.runQuery(Queries.User.get_by_email(email))
         var row : HashMap<String, String> = resultSet.get(0)
-        assertEquals("sample@gmail.com", row["EMAIL"])
+        assertEquals(email, row["EMAIL"])
         assertEquals("ACCESS_TOKEN", row["ACCESS_TOKEN"])
         assertNull(row["ACCESS_KEY"])
         assertNull(row["SECRET_KEY"])
     }
 
+    @Test
+    fun insertDuplicate(){
+        var email = "Dummy@gmail.com"
+
+        var userAccount = UserAccount(email, "ACCESS_TOKEN")
+        AssertionError(UserTable.insertNewUser(userAccount))
+    }
+
     @Test
     fun validateUpdateUser(){
-        var userAccount = UserAccount("sample@gmail.com", "access token")
+        var email = "sample@gmail.com"
+
+        var userAccount = UserAccount(email, "access token")
         UserTable.insertNewUser(userAccount)
 
         userAccount.setSecretKey("secret key")
         userAccount.setAccessKey("access key")
         println("Change update: " + UserTable.updateUser(userAccount))
 
-        var resultSet = Database.runQuery("SELECT * FROM user")
+        var resultSet = Database.runQuery(Queries.User.get_by_email(email))
         var row : HashMap<String, String> = resultSet.get(0)
-        assertEquals("sample@gmail.com", row["EMAIL"])
+        assertEquals(email, row["EMAIL"])
         assertEquals("access token", row["ACCESS_TOKEN"])
         assertEquals("access key", row["ACCESS_KEY"])
         assertEquals("secret key", row["SECRET_KEY"])
@@ -75,8 +85,21 @@ class UserTableTest {
 
     @Test
     fun validateGetByEmail(){
-        var userAccount = UserTable.getByEmail("sample@gmail.com")
-        assertNull(userAccount)
+
+        var email = "sample@gmail.com"
+
+        //Inserting a user
+        var newUser = UserAccount(email, "ACCESS_TOKEN")
+        UserTable.insertNewUser(newUser)
+
+        //Getting inserted user.
+        var userAccount = UserTable.getByEmail(email)
+        assertNotNull(userAccount)
+        assertEquals(email, userAccount.getUserEmail())
+
+        //Getting user who does not exist!
+        var notExistingUser = UserTable.getByEmail("nonExistant@gmail.com")
+        assertNull(notExistingUser)
     }
 
     @Test
@@ -86,7 +109,6 @@ class UserTableTest {
 
     @Test
     fun validateSetValues(){
-
     }
 
 }
\ No newline at end of file

From 08a47fcb9171f4a90c4717e97426c1bfa7dd6e85 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Mon, 27 Mar 2023 13:01:30 +0500
Subject: [PATCH 15/67] Created all the required test cases for new classes I
 had created.

---
 .../sdk/codesync/database/UserTable.java      |  2 +-
 .../intellij/sdk/codesync/utils/Queries.java  |  6 +-
 .../java/org/intellij/sdk/codesync/Helper.kt  |  2 -
 .../sdk/codesync/model/UserAccountTest.kt     | 87 +++++++++++++++++--
 4 files changed, 86 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/intellij/sdk/codesync/database/UserTable.java b/src/main/java/org/intellij/sdk/codesync/database/UserTable.java
index c2f63279..0e434a9c 100644
--- a/src/main/java/org/intellij/sdk/codesync/database/UserTable.java
+++ b/src/main/java/org/intellij/sdk/codesync/database/UserTable.java
@@ -34,7 +34,7 @@ public static void updateAllUsersInActive(){
     public static UserAccount getActiveUser(){
         ArrayList<HashMap<String, String>> usersArray = Database.runQuery(Queries.User.get_by_active_status(true));
 
-        if(usersArray.size() > 0){
+        if(usersArray != null){
             UserAccount userAccount = new UserAccount((String) usersArray.get(0).get("EMAIL"));
             userAccount.setAccessKey((String) usersArray.get(0).getOrDefault("ACCESS_KEY", null));
             userAccount.setAccessToken((String) usersArray.get(0).getOrDefault("ACCESS_TOKEN", null));
diff --git a/src/main/java/org/intellij/sdk/codesync/utils/Queries.java b/src/main/java/org/intellij/sdk/codesync/utils/Queries.java
index 6ac3b325..adc27812 100644
--- a/src/main/java/org/intellij/sdk/codesync/utils/Queries.java
+++ b/src/main/java/org/intellij/sdk/codesync/utils/Queries.java
@@ -1,12 +1,12 @@
 package org.intellij.sdk.codesync.utils;
 
-import javax.annotation.Nullable;
-
 public class Queries {
 
-    public static final String CREATE_USER_TABLE = "CREATE TABLE IF NOT EXISTS user (EMAIL TEXT PRIMARY KEY, ACCESS_TOKEN TEXT, SECRET_KEY TEXT, ACCESS_KEY TEXT, IS_ACTIVE INT)";
+    //TODO Turn this into multiline string.
+    public static final String CREATE_USER_TABLE = "CREATE TABLE IF NOT EXISTS user(EMAIL TEXT PRIMARY KEY, ACCESS_TOKEN TEXT, SECRET_KEY TEXT, ACCESS_KEY TEXT, IS_ACTIVE INT)";
     public static class User{
 
+
         public static final String TABLE_EXIST = Queries.table_exist("user");
         public static String get_all(){
             return "SELECT * FROM user";
diff --git a/src/test/java/org/intellij/sdk/codesync/Helper.kt b/src/test/java/org/intellij/sdk/codesync/Helper.kt
index a11ec1d7..c429ad73 100644
--- a/src/test/java/org/intellij/sdk/codesync/Helper.kt
+++ b/src/test/java/org/intellij/sdk/codesync/Helper.kt
@@ -2,8 +2,6 @@ package org.intellij.sdk.codesync
 
 class Helper {
 
-
-
     companion object {
         val DIRECTORY_PATH = System.getProperty("user.dir") + "\\src\\test\\java\\test_data"
         val DATABASE_FILE = "\\file.db"
diff --git a/src/test/java/org/intellij/sdk/codesync/model/UserAccountTest.kt b/src/test/java/org/intellij/sdk/codesync/model/UserAccountTest.kt
index e7b3c781..deac0eaf 100644
--- a/src/test/java/org/intellij/sdk/codesync/model/UserAccountTest.kt
+++ b/src/test/java/org/intellij/sdk/codesync/model/UserAccountTest.kt
@@ -1,41 +1,118 @@
 package org.intellij.sdk.codesync.model
 
+import org.intellij.sdk.codesync.Helper
+import org.intellij.sdk.codesync.database.Database
+import org.intellij.sdk.codesync.database.UserTable
 import org.intellij.sdk.codesync.models.UserAccount
+import org.intellij.sdk.codesync.utils.Queries
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
+import java.io.File
 import java.util.*
-import kotlin.test.assertNull
+import kotlin.test.*
 
 class UserAccountTest {
 
+
+    @BeforeEach
+    fun before() {
+        //2. Create directory
+        var file = File(Helper.DIRECTORY_PATH)
+        file.mkdir()
+
+        //3. Connect to db created in step (2) above repo
+        Database.initiate(Helper.CONNECTION_STRING)
+
+        //4. Create user table
+        Database.executeUpdate(Queries.CREATE_USER_TABLE)
+
+        //5. Add dummy user
+        Database.executeUpdate(Queries.User.insert("Dummy@gmail.com","ASDFC", null, null, false));
+    }
+
+    @AfterEach
+    fun after() {
+        //1. Disconnect database
+        Database.disconnect()
+
+        //2. Remove base repo
+        var file = File(Helper.DIRECTORY_PATH + Helper.DATABASE_FILE)
+        file.delete()
+        file = File(Helper.DIRECTORY_PATH)
+        file.delete()
+    }
+
     @Test
     fun validatedGetUser(){
-        var userAccount = UserAccount()
-        assertNull(userAccount.getUser("gulahmed2@gaml.com"))
+        var userAccount = UserAccount("alpha@gmail.com", "ASDF")
+        UserTable.insertNewUser(userAccount);
+        assertNotNull(userAccount.getUser("alpha@gmail.com"))
+        assertNull(userAccount.getUser("beta@gmail.com"))
     }
 
     @Test
     fun validateGetAccessToken(){
+        var userAccount1 = UserAccount("alpha@gmail.com", "alphaAccess")
+        userAccount1.makeActive();
+        UserTable.insertNewUser(userAccount1);
+
+        var userAccount2 = UserAccount("beta@gmail.com", "betaAccess")
+        UserTable.insertNewUser(userAccount2);
+
+        assertEquals("alphaAccess", UserAccount.getAccessToken("alpha@gmail.com"))
+        assertEquals("betaAccess", UserAccount.getAccessToken("beta@gmail.com"))
+        assertNull(UserAccount.getAccessToken("gamma@gmail.com"))
+
 
     }
 
     @Test
     fun validateGetEmail(){
-
+        assertNull(UserAccount.getEmail())
+        var userAccount1 = UserAccount("alpha@gmail.com", "alphaAccess")
+        userAccount1.makeActive();
+        UserTable.insertNewUser(userAccount1);
+        assertEquals("alpha@gmail.com", UserAccount.getEmail())
     }
 
     @Test
     fun validateGetAccessTokenByEmail(){
-
+        assertNull(UserAccount.getAccessTokenByEmail())
+        var userAccount1 = UserAccount("alpha@gmail.com", "alphaAccess")
+        userAccount1.makeActive();
+        UserTable.insertNewUser(userAccount1);
+        assertEquals("alphaAccess", UserAccount.getAccessTokenByEmail())
     }
 
     @Test
     fun validateGetActiveAccessToken(){
+        var userAccount = UserAccount();
+        assertNull(userAccount.getActiveAccessToken())
 
+        var userAccount1 = UserAccount("alpha@gmail.com", "alphaAccess")
+        userAccount1.makeActive();
+        UserTable.insertNewUser(userAccount1);
+        assertEquals("alphaAccess", userAccount.getActiveAccessToken())
     }
 
     @Test
     fun validateSetActiveUser(){
 
+        var userAccount = UserAccount()
+        assertNull(userAccount.getActiveAccessToken())
+
+        var userAccount1 = UserAccount("alpha@gmail.com", "alphaAccess")
+        userAccount1.makeInActive()
+        UserTable.updateUser(userAccount1)
+
+        userAccount1.setActiveUser("alpha@gmail.com", "alphaAccess")
+
+        assertEquals("alpha@gmail.com", userAccount.getActiveUser().getUserEmail())
+
+        userAccount1.setActiveUser("beta@gmail.com", "betaAccess")
+        assertEquals("beta@gmail.com", userAccount.getActiveUser().getUserEmail())
+
     }
 
 }
\ No newline at end of file

From 7c5da99ee639917e00fd43ea9cd17144115cd85d Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Thu, 30 Mar 2023 18:11:05 +0500
Subject: [PATCH 16/67] Further refactoring and implmeneted Basit's feedback.

---
 .../org/intellij/sdk/codesync/Constants.java  |  1 -
 .../sdk/codesync/auth/AuthAction.java         |  3 +-
 .../sdk/codesync/database/Database.java       |  9 ++--
 .../sdk/codesync/database/UserTable.java      | 29 ++-----------
 .../intellij/sdk/codesync/utils/Queries.java  | 41 ++++++++++---------
 .../sdk/codesync/auth/AuthenticatorTest.kt    | 24 +++++------
 .../codeSyncSetup/CodeSyncSetupTest.kt        |  4 +-
 .../sdk/codesync/database/DatabaseTest.kt     |  4 +-
 .../sdk/codesync/database/UserTableTest.kt    |  8 +---
 .../sdk/codesync/model/UserAccountTest.kt     |  8 ++--
 10 files changed, 50 insertions(+), 81 deletions(-)

diff --git a/src/main/java/org/intellij/sdk/codesync/Constants.java b/src/main/java/org/intellij/sdk/codesync/Constants.java
index b68a1921..5485fc88 100644
--- a/src/main/java/org/intellij/sdk/codesync/Constants.java
+++ b/src/main/java/org/intellij/sdk/codesync/Constants.java
@@ -50,7 +50,6 @@ private Constants() {
     //Database queries and strings
     public static final String DATABASE_PATH = Paths.get(CODESYNC_ROOT, "codesyncdb.db").toString();
     public static final String CONNECTION_STRING = "jdbc:sqlite:" + DATABASE_PATH;
-    public static final String CREATE_USER_TABLE_QUERY = "CREATE TABLE IF NOT EXISTS user (EMAIL TEXT PRIMARY KEY, ACCESS_TOKEN TEXT, SECRET_KEY TEXT, ACCESS_KEY TEXT, IS_ACTIVE INT)";
 
     public static final String DEFAULT_TIMEZONE = ZoneId.systemDefault().getId();
     public static final String DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS z";
diff --git a/src/main/java/org/intellij/sdk/codesync/auth/AuthAction.java b/src/main/java/org/intellij/sdk/codesync/auth/AuthAction.java
index bc846d10..f5274853 100644
--- a/src/main/java/org/intellij/sdk/codesync/auth/AuthAction.java
+++ b/src/main/java/org/intellij/sdk/codesync/auth/AuthAction.java
@@ -53,8 +53,7 @@ public void actionPerformed(@NotNull AnActionEvent e) {
             server =  CodeSyncAuthServer.getInstance();
             String targetURL = server.getAuthorizationUrl();
             if (pluginState.isAuthenticated) {
-                UserAccount userAccount;
-                userAccount = new UserAccount();
+                UserAccount userAccount = new UserAccount();
 
                 // Clear any cache that depends on user authentication status.
                 new ClearReposToIgnoreCache().execute();
diff --git a/src/main/java/org/intellij/sdk/codesync/database/Database.java b/src/main/java/org/intellij/sdk/codesync/database/Database.java
index eccba5e5..851e15c4 100644
--- a/src/main/java/org/intellij/sdk/codesync/database/Database.java
+++ b/src/main/java/org/intellij/sdk/codesync/database/Database.java
@@ -1,6 +1,5 @@
 package org.intellij.sdk.codesync.database;
 
-import com.intellij.openapi.application.ApplicationManager;
 import org.intellij.sdk.codesync.database.migrations.MigrateUser;
 import org.intellij.sdk.codesync.utils.Queries;
 
@@ -22,14 +21,14 @@ public static void initiate() {
                 Class.forName("org.sqlite.JDBC");
                 String connectionString = CONNECTION_STRING;
                 connection = DriverManager.getConnection(connectionString);
-                executeUpdate(Queries.CREATE_USER_TABLE);
+                executeUpdate(Queries.User.CREATE_TABLE);
                 MigrateUser migrateUser = new MigrateUser();
                 migrateUser.migrateData();
             }else {
                 Class.forName("org.sqlite.JDBC");
                 String connectionString = CONNECTION_STRING;
                 connection = DriverManager.getConnection(connectionString);
-                executeUpdate(Queries.CREATE_USER_TABLE);
+                executeUpdate(Queries.User.CREATE_TABLE);
             }
 
         }catch (Exception exception) {
@@ -76,7 +75,7 @@ public static ArrayList<HashMap<String, String>> runQuery(String query){
             return dataSet;
 
         } catch (Exception exception) {
-            System.out.println("Database error: " + exception.getMessage());
+            System.out.println("DATABASE: [FETCH ERROR] " + exception.getMessage());
         }
 
         return null;
@@ -87,7 +86,7 @@ public static int executeUpdate(String query){
             Statement statement = connection.createStatement();
             return statement.executeUpdate(query);
         } catch (Exception exception) {
-            System.out.println("Database error: " + exception.getMessage());
+            System.out.println("DATABASE: [INSERTION ERROR] " + exception.getMessage());
         }
         return -1;
     }
diff --git a/src/main/java/org/intellij/sdk/codesync/database/UserTable.java b/src/main/java/org/intellij/sdk/codesync/database/UserTable.java
index 0e434a9c..65d77180 100644
--- a/src/main/java/org/intellij/sdk/codesync/database/UserTable.java
+++ b/src/main/java/org/intellij/sdk/codesync/database/UserTable.java
@@ -8,27 +8,16 @@
 
 public class UserTable {
 
-    static String email;
-    static String access_token;
-    static String secret_key;
-    static String access_key;
-    static int is_active;
-
     public static void insertNewUser(UserAccount userAccount){
-        setValues(userAccount);
-        String query = String.format("INSERT INTO user VALUES(%s, %s, %s, %s, %d)", email, access_token, secret_key, access_key, is_active);
-        Database.executeUpdate(query);
+        Database.executeUpdate(Queries.User.insert(userAccount.getUserEmail(), userAccount.getAccessToken(), userAccount.getSecretKey(), userAccount.getAccessKey(), userAccount.getActive()));
     }
 
     public static int updateUser(UserAccount userAccount){
-        setValues(userAccount);
-        String query = String.format("UPDATE user SET access_token = %s, secret_key = %s, access_key = %s, is_active = %d WHERE email = %s", access_token, secret_key, access_key, is_active, email);
-        return Database.executeUpdate(query);
+        return Database.executeUpdate(Queries.User.update_by_email(userAccount.getAccessToken(), userAccount.getSecretKey(), userAccount.getAccessKey(), userAccount.getActive(), userAccount.getUserEmail()));
     }
 
     public static void updateAllUsersInActive(){
-        String query = "UPDATE user SET is_active = 0";
-        Database.executeUpdate(query);
+        Database.executeUpdate(Queries.User.update_all_by_active_status(false));
     }
 
     public static UserAccount getActiveUser(){
@@ -70,16 +59,4 @@ public static UserAccount getByEmail(String email){
         return null;
     }
 
-    static void setValues(UserAccount userAccount){
-        email = userAccount.getUserEmail() != null? String.format("'%s'", userAccount.getUserEmail()) : "NULL";
-        access_token = userAccount.getAccessToken() != null? String.format("'%s'", userAccount.getAccessToken()) : "NULL";
-        secret_key = userAccount.getSecretKey() != null? String.format("'%s'", userAccount.getSecretKey()) : "NULL";
-        access_key = userAccount.getAccessKey() != null? String.format("'%s'", userAccount.getAccessKey()) : "NULL";
-        if(userAccount.getActive() != null){
-            is_active = userAccount.getActive()? 1 : 0;
-        }else{
-            is_active = 0;
-        }
-    }
-
 }
diff --git a/src/main/java/org/intellij/sdk/codesync/utils/Queries.java b/src/main/java/org/intellij/sdk/codesync/utils/Queries.java
index adc27812..14e91c87 100644
--- a/src/main/java/org/intellij/sdk/codesync/utils/Queries.java
+++ b/src/main/java/org/intellij/sdk/codesync/utils/Queries.java
@@ -2,15 +2,12 @@
 
 public class Queries {
 
-    //TODO Turn this into multiline string.
-    public static final String CREATE_USER_TABLE = "CREATE TABLE IF NOT EXISTS user(EMAIL TEXT PRIMARY KEY, ACCESS_TOKEN TEXT, SECRET_KEY TEXT, ACCESS_KEY TEXT, IS_ACTIVE INT)";
     public static class User{
 
-
         public static final String TABLE_EXIST = Queries.table_exist("user");
-        public static String get_all(){
-            return "SELECT * FROM user";
-        }
+
+        //TODO Turn this into multiline string.
+        public static final String CREATE_TABLE = "CREATE TABLE IF NOT EXISTS user(EMAIL TEXT PRIMARY KEY, ACCESS_TOKEN TEXT, SECRET_KEY TEXT, ACCESS_KEY TEXT, IS_ACTIVE INT)";
 
         public static String get_by_email(String email){
             return String.format("SELECT * FROM user WHERE email='%s'", email);
@@ -21,21 +18,27 @@ public static String get_by_active_status(boolean isActive){
             return String.format("SELECT * FROM user WHERE is_active=%s", is_active);
         }
 
-        public static String insert(String email, String access_token, String secret_key, String access_key, boolean status){
-            int is_active;
-            email = email == null? "NULL" : String.format("'%s'", email);
-            access_token = access_token == null? "NULL" : String.format("'%s'", access_token);
-            secret_key = secret_key == null? "NULL" : String.format("'%s'", secret_key);
-            access_key = access_key == null? "NULL" : String.format("'%s'", access_key);
-
-            if(status){
-                is_active = status? 1 : 0;
-            }else{
-                is_active = 0;
-            }
+        public static String insert(String email, String access_token, String secret_key, String access_key, boolean is_active){
+            email = email != null? String.format("'%s'", email) : null;
+            access_token = access_token != null? String.format("'%s'", access_token) : null;
+            secret_key = secret_key != null? String.format("'%s'", secret_key) : null;
+            access_key = access_key != null? String.format("'%s'", access_key) : null;
+            int status = is_active? 1 : 0;
+            return String.format("INSERT INTO user VALUES(%s, %s, %s, %s, %s)", email, access_token, secret_key, access_key, status);
+        }
 
-            return String.format("INSERT INTO user VALUES(%s, %s, %s, %s, %d)", email, access_token, secret_key, access_key, is_active);
+        public static String update_by_email(String access_token, String secret_key, String access_key, boolean is_active, String email){
+            email = email != null? String.format("'%s'", email) : null;
+            access_token = access_token != null? String.format("'%s'", access_token) : null;
+            secret_key = secret_key != null? String.format("'%s'", secret_key) : null;
+            access_key = access_key != null? String.format("'%s'", access_key) : null;
+            int status = is_active? 1 : 0;
+            return String.format("UPDATE user SET access_token = %s, secret_key = %s, access_key = %s, is_active = %s WHERE email = %s", access_token, secret_key, access_key, status, email);
+        }
 
+        public static String update_all_by_active_status(boolean isActive){
+            int is_active = isActive? 1 : 0;
+            return String.format("UPDATE user SET is_active = %d", is_active);
         }
 
     }
diff --git a/src/test/java/org/intellij/sdk/codesync/auth/AuthenticatorTest.kt b/src/test/java/org/intellij/sdk/codesync/auth/AuthenticatorTest.kt
index 0b379ebf..43be734d 100644
--- a/src/test/java/org/intellij/sdk/codesync/auth/AuthenticatorTest.kt
+++ b/src/test/java/org/intellij/sdk/codesync/auth/AuthenticatorTest.kt
@@ -3,27 +3,23 @@ package org.intellij.sdk.codesync.auth
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
+import kotlin.test.assertTrue
 
 class AuthenticatorTest {
 
-    @Test
-    fun validateCreateUser(){
-
-        @BeforeEach
-        fun before(){
-
-        }
-
-        @AfterEach
-        fun after(){
+    @BeforeEach
+    fun before(){
 
-        }
+    }
 
-        @Test
-        fun validateCreateUser(){
+    @AfterEach
+    fun after(){
 
-        }
+    }
 
+    @Test
+    fun validateCreateUser(){
+        assertTrue(true);
     }
 
 }
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetupTest.kt b/src/test/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetupTest.kt
index 4cb1162a..2e208023 100644
--- a/src/test/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetupTest.kt
+++ b/src/test/java/org/intellij/sdk/codesync/codeSyncSetup/CodeSyncSetupTest.kt
@@ -21,10 +21,10 @@ class CodeSyncSetupTest {
         Database.initiate(Helper.CONNECTION_STRING)
 
         //4. Create user table
-        Database.executeUpdate(Queries.CREATE_USER_TABLE)
+        Database.executeUpdate(Queries.User.CREATE_TABLE)
 
         //5. Add dummy user
-        Database.executeUpdate(Queries.User.insert("Dummy@gmail.com","ASDFC", null, null, false));
+        Database.executeUpdate(Queries.User.insert("dummy@gmail.com","ASDFC", null, null, false));
     }
 
     @AfterEach
diff --git a/src/test/java/org/intellij/sdk/codesync/database/DatabaseTest.kt b/src/test/java/org/intellij/sdk/codesync/database/DatabaseTest.kt
index d9f65be8..ec5c7c8a 100644
--- a/src/test/java/org/intellij/sdk/codesync/database/DatabaseTest.kt
+++ b/src/test/java/org/intellij/sdk/codesync/database/DatabaseTest.kt
@@ -23,10 +23,10 @@ class DatabaseTest {
         Database.initiate(Helper.CONNECTION_STRING)
 
         //4. Create user table
-        Database.executeUpdate(Queries.CREATE_USER_TABLE)
+        Database.executeUpdate(Queries.User.CREATE_TABLE)
 
         //5. Add dummy user
-        Database.executeUpdate(Queries.User.insert("Dummy@gmail.com","ASDFC", null, null, false));
+        Database.executeUpdate(Queries.User.insert("dummy@gmail.com","ASDFC", null, null, false));
     }
 
     @AfterEach
diff --git a/src/test/java/org/intellij/sdk/codesync/database/UserTableTest.kt b/src/test/java/org/intellij/sdk/codesync/database/UserTableTest.kt
index c3f8cd47..8cb8533c 100644
--- a/src/test/java/org/intellij/sdk/codesync/database/UserTableTest.kt
+++ b/src/test/java/org/intellij/sdk/codesync/database/UserTableTest.kt
@@ -23,10 +23,10 @@ class UserTableTest {
         Database.initiate(Helper.CONNECTION_STRING)
 
         //4. Create user table
-        Database.executeUpdate(Queries.CREATE_USER_TABLE)
+        Database.executeUpdate(Queries.User.CREATE_TABLE)
 
         //5. Add dummy user
-        Database.executeUpdate(Queries.User.insert("Dummy@gmail.com","ASDFC", null, null, false));
+        Database.executeUpdate(Queries.User.insert("dummy@gmail.com","ASDFC", null, null, false));
     }
 
     @AfterEach
@@ -107,8 +107,4 @@ class UserTableTest {
 
     }
 
-    @Test
-    fun validateSetValues(){
-    }
-
 }
\ No newline at end of file
diff --git a/src/test/java/org/intellij/sdk/codesync/model/UserAccountTest.kt b/src/test/java/org/intellij/sdk/codesync/model/UserAccountTest.kt
index deac0eaf..f44b3670 100644
--- a/src/test/java/org/intellij/sdk/codesync/model/UserAccountTest.kt
+++ b/src/test/java/org/intellij/sdk/codesync/model/UserAccountTest.kt
@@ -9,8 +9,9 @@ import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import java.io.File
-import java.util.*
-import kotlin.test.*
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
 
 class UserAccountTest {
 
@@ -25,7 +26,7 @@ class UserAccountTest {
         Database.initiate(Helper.CONNECTION_STRING)
 
         //4. Create user table
-        Database.executeUpdate(Queries.CREATE_USER_TABLE)
+        Database.executeUpdate(Queries.User.CREATE_TABLE)
 
         //5. Add dummy user
         Database.executeUpdate(Queries.User.insert("Dummy@gmail.com","ASDFC", null, null, false));
@@ -107,7 +108,6 @@ class UserAccountTest {
         UserTable.updateUser(userAccount1)
 
         userAccount1.setActiveUser("alpha@gmail.com", "alphaAccess")
-
         assertEquals("alpha@gmail.com", userAccount.getActiveUser().getUserEmail())
 
         userAccount1.setActiveUser("beta@gmail.com", "betaAccess")

From 8574107d928b6a548c75c65c37b42d0d03beca87 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Mon, 3 Apr 2023 14:57:21 +0500
Subject: [PATCH 17/67] Build git action.

---
 .github/workflows/actions.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .github/workflows/actions.yml

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
new file mode 100644
index 00000000..ba47e051
--- /dev/null
+++ b/.github/workflows/actions.yml
@@ -0,0 +1,19 @@
+name: First Git Actions
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'temurin'
+      - name: Build with Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: build
\ No newline at end of file

From 50c66b7c699bfd4dbedabb5f95afec8674e84e73 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Tue, 4 Apr 2023 00:47:38 +0500
Subject: [PATCH 18/67] Jacoco Coverage

---
 .github/workflows/actions.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index ba47e051..b84504fd 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -16,4 +16,16 @@ jobs:
       - name: Build with Gradle
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: build
\ No newline at end of file
+          arguments: build
+
+      - name: Generate JaCoCo badge
+        id: jacoco
+        uses: cicirello/jacoco-badge-generator@v2
+        with:
+        badges-directory: badges
+        generate-branches-badge: true
+        generate-summary: true
+
+      - name: Log coverage percentages to workflow output
+        run: |
+          echo "coverage = ${{ steps.jacoco.outputs.coverage }}"

From 8f06555a75af3b2c297ce3bee3f9973ecc5d998d Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Tue, 4 Apr 2023 00:49:17 +0500
Subject: [PATCH 19/67] Jacoco Coverage 2

---
 .github/workflows/actions.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index b84504fd..cb077bfa 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -22,9 +22,9 @@ jobs:
         id: jacoco
         uses: cicirello/jacoco-badge-generator@v2
         with:
-        badges-directory: badges
-        generate-branches-badge: true
-        generate-summary: true
+          badges-directory: badges
+          generate-branches-badge: true
+          generate-summary: true
 
       - name: Log coverage percentages to workflow output
         run: |

From 27aebdf5d3f3c5e9935b4f6663b95b52b5f7165d Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Tue, 4 Apr 2023 14:00:15 +0500
Subject: [PATCH 20/67] Trying JaCoCo

---
 .github/workflows/actions.yml | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index cb077bfa..b89afbb3 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -13,19 +13,7 @@ jobs:
         with:
           java-version: '11'
           distribution: 'temurin'
-      - name: Build with Gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: build
-
-      - name: Generate JaCoCo badge
-        id: jacoco
-        uses: cicirello/jacoco-badge-generator@v2
-        with:
-          badges-directory: badges
-          generate-branches-badge: true
-          generate-summary: true
-
-      - name: Log coverage percentages to workflow output
+      - name: Run Coverage
         run: |
-          echo "coverage = ${{ steps.jacoco.outputs.coverage }}"
+          chmod +x gradlew
+          ./gradlew testCoverage
\ No newline at end of file

From a48599ab59a72e2d12a360d5aefd71b94c78edcc Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Tue, 4 Apr 2023 14:06:12 +0500
Subject: [PATCH 21/67] JaCoCo 2

---
 .github/workflows/actions.yml | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index b89afbb3..c1b74a8f 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -1,19 +1,26 @@
-name: First Git Actions
+name: Measure coverage
 
 on: [push]
 
 jobs:
   build:
     runs-on: ubuntu-latest
-
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
         with:
-          java-version: '11'
-          distribution: 'temurin'
+          java-version: 1.8
       - name: Run Coverage
         run: |
           chmod +x gradlew
-          ./gradlew testCoverage
\ No newline at end of file
+          ./gradlew testCoverage
+
+      - name: Add coverage to PR
+        id: jacoco
+        uses: madrapps/jacoco-report@v1.3
+        with:
+          paths: ${{ github.workspace }}/build/reports/jacoco/testCoverage/testCoverage.xml
+          token: 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
+          min-coverage-overall: 40
+          min-coverage-changed-files: 60
\ No newline at end of file

From 45eb1ce45d14ea32be0665d8562c89fcaca2175c Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Tue, 4 Apr 2023 14:16:00 +0500
Subject: [PATCH 22/67] Reverting changes.

---
 .github/workflows/actions.yml | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index c1b74a8f..ba47e051 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -1,26 +1,19 @@
-name: Measure coverage
+name: First Git Actions
 
 on: [push]
 
 jobs:
   build:
     runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
-      - name: Run Coverage
-        run: |
-          chmod +x gradlew
-          ./gradlew testCoverage
-
-      - name: Add coverage to PR
-        id: jacoco
-        uses: madrapps/jacoco-report@v1.3
+          java-version: '11'
+          distribution: 'temurin'
+      - name: Build with Gradle
+        uses: gradle/gradle-build-action@v2
         with:
-          paths: ${{ github.workspace }}/build/reports/jacoco/testCoverage/testCoverage.xml
-          token: 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
-          min-coverage-overall: 40
-          min-coverage-changed-files: 60
\ No newline at end of file
+          arguments: build
\ No newline at end of file

From 1475e53449b7c97e6622964e90d414bf41d0009b Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Tue, 4 Apr 2023 23:03:06 +0500
Subject: [PATCH 23/67] Getting working directory.

---
 .github/workflows/actions.yml |  4 +++-
 build.gradle                  | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index ba47e051..b5fc4d92 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -16,4 +16,6 @@ jobs:
       - name: Build with Gradle
         uses: gradle/gradle-build-action@v2
         with:
-          arguments: build
\ No newline at end of file
+          arguments: build
+      - name: Print current working directory
+        run: pwd
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 6b811aea..6d69fd1e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,6 +4,7 @@ plugins {
   id 'java'
   id 'org.jetbrains.intellij' version '0.6.5'
   id("org.jetbrains.kotlin.jvm") version "1.8.0"
+  id 'jacoco'
 }
 
 group 'com.codesync'
@@ -33,6 +34,25 @@ patchPluginXml {
   untilBuild = '231.*'
 }
 
+jacoco {
+  toolVersion = "0.8.5"
+}
+
+task jacocoTestReport(type: JacocoReport, dependsOn: ['test']) {
+  reports {
+    xml.enabled true
+    html.enabled true
+  }
+  def excludes = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*', 'android/**/*.*']
+  classDirectories.setFrom(files("${project.rootDir}/build/intermediates/classes/debug"))
+  sourceDirectories.setFrom(files("${project.rootDir}/src/main/java"))
+  executionData.setFrom(files("${project.rootDir}/build/jacoco/testDebugUnitTest.exec"))
+  additionalSourceDirs.from(files("${project.rootDir}/src/test/java"))
+  additionalClassDirs.from(files("${project.rootDir}/build/intermediates/classes/test/debug"))
+  excludes = excludes + ['**/*Test*.class', '**/*$*$*.class']
+  exclude(excludes)
+}
+
 dependencies {
   implementation files('libs/diff_match_patch.jar')
   implementation files('libs/gitignore-file-filter-1.0.0.jar')

From c61327c267a306eafa9bc9552d7f9c2b1f1448d7 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 00:01:52 +0500
Subject: [PATCH 24/67] Renaming taks.

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6d69fd1e..4517a72b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,7 +38,7 @@ jacoco {
   toolVersion = "0.8.5"
 }
 
-task jacocoTestReport(type: JacocoReport, dependsOn: ['test']) {
+task myJacocoTestReport(type: JacocoReport, dependsOn: ['test']) {
   reports {
     xml.enabled true
     html.enabled true

From 7f0972748599c2824ddbcab9f50fa987525e0b06 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 00:05:25 +0500
Subject: [PATCH 25/67] Adding path and action

---
 .github/workflows/actions.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index b5fc4d92..ca255ea2 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -13,9 +13,6 @@ jobs:
         with:
           java-version: '11'
           distribution: 'temurin'
-      - name: Build with Gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: build
-      - name: Print current working directory
-        run: pwd
\ No newline at end of file
+      - name: Run tests and generate test coverage report
+        run: ./gradlew test jacocoTestReport
+        working-directory: '/home/runner/work/codesync-intellij/codesync-intellij/'
\ No newline at end of file

From 9b357548d3e42f45d9ed2267cb4bcf99b05ebdd8 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 00:11:04 +0500
Subject: [PATCH 26/67] Rename action.

---
 .github/workflows/actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index ca255ea2..e090f950 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -14,5 +14,5 @@ jobs:
           java-version: '11'
           distribution: 'temurin'
       - name: Run tests and generate test coverage report
-        run: ./gradlew test jacocoTestReport
+        run: ./gradlew test myJacocoTestReport
         working-directory: '/home/runner/work/codesync-intellij/codesync-intellij/'
\ No newline at end of file

From e7657f1974aa383284d429948c504fc0fe4d0413 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 00:44:43 +0500
Subject: [PATCH 27/67] Using Coberture.

---
 .github/workflows/actions.yml | 11 ++++++++---
 build.gradle                  | 21 +++------------------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index e090f950..d0df6709 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -13,6 +13,11 @@ jobs:
         with:
           java-version: '11'
           distribution: 'temurin'
-      - name: Run tests and generate test coverage report
-        run: ./gradlew test myJacocoTestReport
-        working-directory: '/home/runner/work/codesync-intellij/codesync-intellij/'
\ No newline at end of file
+      - name: Build and test with Cobertura
+        run: |
+          ./gradlew clean build cobertura
+      - name: Upload Cobertura report
+        uses: actions/upload-artifact@v2
+        with:
+          name: cobertura-report
+          path: build/reports/cobertura/xml/
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 4517a72b..b48130f9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
   id 'java'
   id 'org.jetbrains.intellij' version '0.6.5'
   id("org.jetbrains.kotlin.jvm") version "1.8.0"
-  id 'jacoco'
+  id 'cobertura'
 }
 
 group 'com.codesync'
@@ -34,23 +34,8 @@ patchPluginXml {
   untilBuild = '231.*'
 }
 
-jacoco {
-  toolVersion = "0.8.5"
-}
-
-task myJacocoTestReport(type: JacocoReport, dependsOn: ['test']) {
-  reports {
-    xml.enabled true
-    html.enabled true
-  }
-  def excludes = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*', 'android/**/*.*']
-  classDirectories.setFrom(files("${project.rootDir}/build/intermediates/classes/debug"))
-  sourceDirectories.setFrom(files("${project.rootDir}/src/main/java"))
-  executionData.setFrom(files("${project.rootDir}/build/jacoco/testDebugUnitTest.exec"))
-  additionalSourceDirs.from(files("${project.rootDir}/src/test/java"))
-  additionalClassDirs.from(files("${project.rootDir}/build/intermediates/classes/test/debug"))
-  excludes = excludes + ['**/*Test*.class', '**/*$*$*.class']
-  exclude(excludes)
+cobertura {
+  coverageFormats = ['xml']
 }
 
 dependencies {

From 1ecbada1721219fca5bbf9d227b84a514f06a060 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 00:56:10 +0500
Subject: [PATCH 28/67] Trying gradle test.

---
 .github/workflows/actions.yml | 14 ++++++++------
 build.gradle                  |  5 -----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index d0df6709..e6a874a0 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -13,11 +13,13 @@ jobs:
         with:
           java-version: '11'
           distribution: 'temurin'
-      - name: Build and test with Cobertura
-        run: |
-          ./gradlew clean build cobertura
-      - name: Upload Cobertura report
+      - name: Run tests with Gradle
+        uses: actions/exec@v2
+        with:
+            command: ./gradlew test --info --stacktrace
+
+      - name: Upload code coverage report
         uses: actions/upload-artifact@v2
         with:
-          name: cobertura-report
-          path: build/reports/cobertura/xml/
\ No newline at end of file
+            name: code-coverage-report
+            path: build/reports/tests/test/index.html
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index b48130f9..6b811aea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,6 @@ plugins {
   id 'java'
   id 'org.jetbrains.intellij' version '0.6.5'
   id("org.jetbrains.kotlin.jvm") version "1.8.0"
-  id 'cobertura'
 }
 
 group 'com.codesync'
@@ -34,10 +33,6 @@ patchPluginXml {
   untilBuild = '231.*'
 }
 
-cobertura {
-  coverageFormats = ['xml']
-}
-
 dependencies {
   implementation files('libs/diff_match_patch.jar')
   implementation files('libs/gitignore-file-filter-1.0.0.jar')

From 66ccaa8d72fd1b2a08d1c2a620c857a7e31ecd18 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 01:03:27 +0500
Subject: [PATCH 29/67] Trying gradle test 2

---
 .github/workflows/actions.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index e6a874a0..27ebb48f 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -8,11 +8,16 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+
+      - name: Setup Actions Toolkit
+        uses: actions/toolkit@v2.4.2
+
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
           java-version: '11'
           distribution: 'temurin'
+
       - name: Run tests with Gradle
         uses: actions/exec@v2
         with:

From fd5b2133a9dbac6debdd204f02b86b119b3a6cc1 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 01:27:27 +0500
Subject: [PATCH 30/67] Using run instead of use

---
 .github/workflows/actions.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 27ebb48f..108a2626 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -9,9 +9,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Setup Actions Toolkit
-        uses: actions/toolkit@v2.4.2
-
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
@@ -19,9 +16,7 @@ jobs:
           distribution: 'temurin'
 
       - name: Run tests with Gradle
-        uses: actions/exec@v2
-        with:
-            command: ./gradlew test --info --stacktrace
+        run: ./gradlew test --info --stacktrace
 
       - name: Upload code coverage report
         uses: actions/upload-artifact@v2

From 83750420a412e523c1f609860996b059c7650c59 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 02:03:31 +0500
Subject: [PATCH 31/67] Using JaCoCo with gradle.

---
 .github/workflows/actions.yml | 14 ++++++++++----
 build.gradle                  |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 108a2626..90705d35 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -15,11 +15,17 @@ jobs:
           java-version: '11'
           distribution: 'temurin'
 
-      - name: Run tests with Gradle
-        run: ./gradlew test --info --stacktrace
+      - name: Build and run tests with JaCoCo
+        run: ./gradlew clean build jacocoTestReport --stacktrace
+
+      - name: Upload test reports
+        uses: actions/upload-artifact@v2
+        with:
+          name: test-reports
+          path: build/test-results/test
 
       - name: Upload code coverage report
         uses: actions/upload-artifact@v2
         with:
-            name: code-coverage-report
-            path: build/reports/tests/test/index.html
\ No newline at end of file
+          name: code-coverage-report
+          path: build/reports/jacoco/test/html/index.html
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 6b811aea..0e6a1b9f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,6 +4,7 @@ plugins {
   id 'java'
   id 'org.jetbrains.intellij' version '0.6.5'
   id("org.jetbrains.kotlin.jvm") version "1.8.0"
+  id 'jacoco'
 }
 
 group 'com.codesync'

From 461e495009e973537110810384acd77ee4124644 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 02:10:53 +0500
Subject: [PATCH 32/67] Reading coverage in console.

---
 .github/workflows/actions.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 90705d35..5e835cc5 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -28,4 +28,8 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: code-coverage-report
-          path: build/reports/jacoco/test/html/index.html
\ No newline at end of file
+          path: build/reports/jacoco/test/html/index.html
+
+      - name: Display code coverage in console
+        run: |
+            cat build/reports/jacoco/test/html/index.html | grep 'span class="el_percent">Line</span>' -A 1 | tail -n 1 | sed -e 's/<[^>]*>//g'
\ No newline at end of file

From 500b228b2a968597d339c446899e7d93824313bc Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 02:25:34 +0500
Subject: [PATCH 33/67] Publishing Coverage.

---
 .github/workflows/actions.yml | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 5e835cc5..b52926b5 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -32,4 +32,32 @@ jobs:
 
       - name: Display code coverage in console
         run: |
-            cat build/reports/jacoco/test/html/index.html | grep 'span class="el_percent">Line</span>' -A 1 | tail -n 1 | sed -e 's/<[^>]*>//g'
\ No newline at end of file
+            cat build/reports/jacoco/test/html/index.html | grep 'span class="el_percent">Line</span>' -A 1 | tail -n 1 | sed -e 's/<[^>]*>//g'
+
+      - name: Post code coverage report as a check
+        uses: actions/github-script@v4
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          script: |
+              const { data } = await github.rest.pulls.get({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                pull_number: context.payload.pull_request.number
+              });
+              
+              const reportUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/blob/${context.sha}/build/reports/jacoco/test/html/index.html`;
+              
+              await github.rest.checks.create({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                name: 'Code Coverage',
+                head_sha: context.sha,
+                status: 'completed',
+                conclusion: 'success',
+                output: {
+                  title: 'Code Coverage Report',
+                  summary: `Code coverage report: ${reportUrl}`,
+                  annotations: []
+                }
+              });
\ No newline at end of file

From d979cdbbcef06da3e08f82958855cdaa57d878c8 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 03:27:52 +0500
Subject: [PATCH 34/67] Working with Grep

---
 .github/workflows/actions.yml | 30 +-----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index b52926b5..423b607e 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -32,32 +32,4 @@ jobs:
 
       - name: Display code coverage in console
         run: |
-            cat build/reports/jacoco/test/html/index.html | grep 'span class="el_percent">Line</span>' -A 1 | tail -n 1 | sed -e 's/<[^>]*>//g'
-
-      - name: Post code coverage report as a check
-        uses: actions/github-script@v4
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          script: |
-              const { data } = await github.rest.pulls.get({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                pull_number: context.payload.pull_request.number
-              });
-              
-              const reportUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/blob/${context.sha}/build/reports/jacoco/test/html/index.html`;
-              
-              await github.rest.checks.create({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                name: 'Code Coverage',
-                head_sha: context.sha,
-                status: 'completed',
-                conclusion: 'success',
-                output: {
-                  title: 'Code Coverage Report',
-                  summary: `Code coverage report: ${reportUrl}`,
-                  annotations: []
-                }
-              });
\ No newline at end of file
+            cat build/reports/jacoco/test/html/index.html | grep Total
\ No newline at end of file

From ce537328b9e0a5c4c6d42c71bda25ee927886948 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 03:52:07 +0500
Subject: [PATCH 35/67] Printing coverage % using grep

---
 .github/workflows/actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 423b607e..df887836 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -32,4 +32,4 @@ jobs:
 
       - name: Display code coverage in console
         run: |
-            cat build/reports/jacoco/test/html/index.html | grep Total
\ No newline at end of file
+            cat build/reports/jacoco/test/html/index.html | grep -oP '(?<=<td class="ctr2">).*?(?=%</td>)' | head -n1
\ No newline at end of file

From 1d055709e92dd8173e0b88d5c851b147ddc64861 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 04:01:40 +0500
Subject: [PATCH 36/67] Formated text.

---
 .github/workflows/actions.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index df887836..bee902cc 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -32,4 +32,5 @@ jobs:
 
       - name: Display code coverage in console
         run: |
-            cat build/reports/jacoco/test/html/index.html | grep -oP '(?<=<td class="ctr2">).*?(?=%</td>)' | head -n1
\ No newline at end of file
+            COVERAGE=$(cat build/reports/jacoco/test/html/index.html | grep -oP '(?<=<td class="ctr2">).*?(?=%</td>)' | head -n1)
+            echo "The test coverage is: $COVERAGE %"
\ No newline at end of file

From d19ff23554623f3a0862cffbc925926340c47d4e Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 04:24:39 +0500
Subject: [PATCH 37/67] Trying to get report in CSV

---
 build.gradle | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/build.gradle b/build.gradle
index 0e6a1b9f..40a145ea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,6 +34,13 @@ patchPluginXml {
   untilBuild = '231.*'
 }
 
+jacocoTestReport {
+  reports {
+    csv.enabled true
+    csv.destination file("$buildDir/reports/coverage/report.csv")
+  }
+}
+
 dependencies {
   implementation files('libs/diff_match_patch.jar')
   implementation files('libs/gitignore-file-filter-1.0.0.jar')

From f6ea5c69d6e5ac5358774b4352b444dc969ee72a Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 04:45:49 +0500
Subject: [PATCH 38/67] Report in comment.

---
 .github/workflows/actions.yml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index bee902cc..fb099a69 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -27,10 +27,18 @@ jobs:
       - name: Upload code coverage report
         uses: actions/upload-artifact@v2
         with:
-          name: code-coverage-report
-          path: build/reports/jacoco/test/html/index.html
+          name: coverage-report
+          path: build/reports/coverage/report.csv
 
       - name: Display code coverage in console
         run: |
-            COVERAGE=$(cat build/reports/jacoco/test/html/index.html | grep -oP '(?<=<td class="ctr2">).*?(?=%</td>)' | head -n1)
-            echo "The test coverage is: $COVERAGE %"
\ No newline at end of file
+          csv_contents=$(cat path/to/your/csv/file.csv)
+
+      - name: Create PR Comment
+        uses: unsplash/comment-on-pr@v1.4.0
+        with:
+          message: |
+            **CSV Report**
+            ```
+            $csv_contents
+            ```
\ No newline at end of file

From 4a965a85f3c833a3baa7280fcfddae214fcb91fd Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 04:48:40 +0500
Subject: [PATCH 39/67] Version splash

---
 .github/workflows/actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index fb099a69..7d478bf4 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -35,7 +35,7 @@ jobs:
           csv_contents=$(cat path/to/your/csv/file.csv)
 
       - name: Create PR Comment
-        uses: unsplash/comment-on-pr@v1.4.0
+        uses: unsplash/comment-on-pr@v1.5.0
         with:
           message: |
             **CSV Report**

From 3105715b9134054c435485a3a419f5061da52287 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 04:50:54 +0500
Subject: [PATCH 40/67] Without version

---
 .github/workflows/actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 7d478bf4..877e2521 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -35,7 +35,7 @@ jobs:
           csv_contents=$(cat path/to/your/csv/file.csv)
 
       - name: Create PR Comment
-        uses: unsplash/comment-on-pr@v1.5.0
+        uses: unsplash/comment-on-pr
         with:
           message: |
             **CSV Report**

From 391933c5bb5ff515bee51674e33a3f0ff77667c0 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 04:52:29 +0500
Subject: [PATCH 41/67] Old version

---
 .github/workflows/actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 877e2521..297a5943 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -35,7 +35,7 @@ jobs:
           csv_contents=$(cat path/to/your/csv/file.csv)
 
       - name: Create PR Comment
-        uses: unsplash/comment-on-pr
+        uses: unsplash/comment-on-pr@v1.3.0
         with:
           message: |
             **CSV Report**

From b45cf30d500b3eb3926ae07e2a682db0bd2cf45e Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 04:56:32 +0500
Subject: [PATCH 42/67] Setting path

---
 .github/workflows/actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 297a5943..a213d9d1 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -32,7 +32,7 @@ jobs:
 
       - name: Display code coverage in console
         run: |
-          csv_contents=$(cat path/to/your/csv/file.csv)
+          csv_contents=$(cat build/reports/coverage/report.csv)
 
       - name: Create PR Comment
         uses: unsplash/comment-on-pr@v1.3.0

From 1fb6805447c4c6b688fce5349389c1b8fad2adf9 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 05:02:02 +0500
Subject: [PATCH 43/67] Changing message to msg

---
 .github/workflows/actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index a213d9d1..d9246f1e 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -37,7 +37,7 @@ jobs:
       - name: Create PR Comment
         uses: unsplash/comment-on-pr@v1.3.0
         with:
-          message: |
+          msg: |
             **CSV Report**
             ```
             $csv_contents

From a9b0d146bf94eae402156762dc7d68161762faf6 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 05:09:39 +0500
Subject: [PATCH 44/67] Hello, World!

---
 .github/workflows/actions.yml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index d9246f1e..7b4aa3e5 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -34,11 +34,15 @@ jobs:
         run: |
           csv_contents=$(cat build/reports/coverage/report.csv)
 
-      - name: Create PR Comment
-        uses: unsplash/comment-on-pr@v1.3.0
+      - name: Create comment
+        uses: actions/github-script@v4
         with:
-          msg: |
-            **CSV Report**
-            ```
-            $csv_contents
-            ```
\ No newline at end of file
+          script: |
+            github.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: 'Hello, world!'
+            })
+          env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file

From e4484465ed18ede1e9d91752f2ed2219146195e6 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 05:55:31 +0500
Subject: [PATCH 45/67] Echo CSV file

---
 .github/workflows/actions.yml | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 7b4aa3e5..a8ee745b 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -34,15 +34,5 @@ jobs:
         run: |
           csv_contents=$(cat build/reports/coverage/report.csv)
 
-      - name: Create comment
-        uses: actions/github-script@v4
-        with:
-          script: |
-            github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: 'Hello, world!'
-            })
-          env:
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+      - name: Print CSV data
+        run: echo ${csv_contents}
\ No newline at end of file

From 3eeca9bf91f3216a13539f21216228387eb863a7 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 05:59:28 +0500
Subject: [PATCH 46/67] Printing CSV file

---
 .github/workflows/actions.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index a8ee745b..e0ce4737 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -32,7 +32,4 @@ jobs:
 
       - name: Display code coverage in console
         run: |
-          csv_contents=$(cat build/reports/coverage/report.csv)
-
-      - name: Print CSV data
-        run: echo ${csv_contents}
\ No newline at end of file
+          cat build/reports/coverage/report.csv
\ No newline at end of file

From 452e01793aea9d201a151158c9814a789c40edf7 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 16:33:10 +0500
Subject: [PATCH 47/67] Printing values in comment

---
 .github/workflows/actions.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index e0ce4737..8a3f46a8 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -30,6 +30,13 @@ jobs:
           name: coverage-report
           path: build/reports/coverage/report.csv
 
-      - name: Display code coverage in console
-        run: |
-          cat build/reports/coverage/report.csv
\ No newline at end of file
+      - name: Print CSV values as a comment in PR
+        uses: unsplash/comment-on-pr@v1
+        with:
+          message: |
+              CSV values:
+              ```
+              $(cat build/reports/coverage/report.csv)
+              ```
+          env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file

From b79f5bcdbd900d25c17f210fa17caa513de624e0 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 16:34:13 +0500
Subject: [PATCH 48/67] Fix indentation

---
 .github/workflows/actions.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 8a3f46a8..0acdd8cb 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -38,5 +38,5 @@ jobs:
               ```
               $(cat build/reports/coverage/report.csv)
               ```
-          env:
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file

From dec627f2df6259375ee8a70d88fc5ac0c5657eef Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 16:39:33 +0500
Subject: [PATCH 49/67] Fix Version Issue

---
 .github/workflows/actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 0acdd8cb..5e2a357d 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -31,7 +31,7 @@ jobs:
           path: build/reports/coverage/report.csv
 
       - name: Print CSV values as a comment in PR
-        uses: unsplash/comment-on-pr@v1
+        uses: unsplash/comment-on-pr@v1.3.0
         with:
           message: |
               CSV values:

From 3dc8eaa0a1bbf18a1d7bf82a3afd1aa403850a02 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 16:43:01 +0500
Subject: [PATCH 50/67] Valid msg argument

---
 .github/workflows/actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 5e2a357d..1eb0b26a 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Print CSV values as a comment in PR
         uses: unsplash/comment-on-pr@v1.3.0
         with:
-          message: |
+          msg: |
               CSV values:
               ```
               $(cat build/reports/coverage/report.csv)

From 5c5407d6957ceca0b4b7bcf8b43ee0205d5ce332 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 16:51:41 +0500
Subject: [PATCH 51/67] Using different action

---
 .github/workflows/actions.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 1eb0b26a..e06735fe 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -31,12 +31,9 @@ jobs:
           path: build/reports/coverage/report.csv
 
       - name: Print CSV values as a comment in PR
-        uses: unsplash/comment-on-pr@v1.3.0
+        uses: thollander/actions-comment-pull-request@v1
         with:
-          msg: |
-              CSV values:
-              ```
-              $(cat build/reports/coverage/report.csv)
-              ```
+          message: |
+              Hello, World!
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file

From b9b10765acbae4da82b6342bccf2fca65b3a7280 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 17:00:09 +0500
Subject: [PATCH 52/67] Removed env

---
 .github/workflows/actions.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index e06735fe..bdd7b835 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -35,5 +35,4 @@ jobs:
         with:
           message: |
               Hello, World!
-        env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file

From 5e96accc70ab20a6e4e68b017a37d77365c11e82 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 17:07:23 +0500
Subject: [PATCH 53/67] Rigid

---
 .github/workflows/actions.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index bdd7b835..f81ec752 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -32,7 +32,9 @@ jobs:
 
       - name: Print CSV values as a comment in PR
         uses: thollander/actions-comment-pull-request@v1
-        with:
-          message: |
-              Hello, World!
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+        run: |
+          CSV=$(cat path/to/csv/file.csv)
+          COMMENT="CSV values:\n\`\`\`$CSV\`\`\`"
+          PR_NUMBER=$(echo "$GITHUB_REF" | awk 'BEGIN { FS="/" } { print $3 }')
+          URL="https://api.github.com/repos/${GITHUB_REPOSITORY}/issues/${PR_NUMBER}/comments"
+          curl --request POST --url "$URL" --header "authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" --header "content-type: application/json" --data "{\"body\": \"$COMMENT\"}"
\ No newline at end of file

From 9042e81adf564bf14b15f94b6d74f12ef21e5049 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 17:08:35 +0500
Subject: [PATCH 54/67] Syntax fixed

---
 .github/workflows/actions.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index f81ec752..04ef1a64 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -31,9 +31,8 @@ jobs:
           path: build/reports/coverage/report.csv
 
       - name: Print CSV values as a comment in PR
-        uses: thollander/actions-comment-pull-request@v1
         run: |
-          CSV=$(cat path/to/csv/file.csv)
+          CSV=$(cat build/reports/coverage/report.csv)
           COMMENT="CSV values:\n\`\`\`$CSV\`\`\`"
           PR_NUMBER=$(echo "$GITHUB_REF" | awk 'BEGIN { FS="/" } { print $3 }')
           URL="https://api.github.com/repos/${GITHUB_REPOSITORY}/issues/${PR_NUMBER}/comments"

From f0193898fe520b591a32b505cacf7e5659c267d0 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Wed, 5 Apr 2023 17:15:29 +0500
Subject: [PATCH 55/67] Simple Hellow World

---
 .github/workflows/actions.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 04ef1a64..eb1f3b29 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -32,8 +32,7 @@ jobs:
 
       - name: Print CSV values as a comment in PR
         run: |
-          CSV=$(cat build/reports/coverage/report.csv)
-          COMMENT="CSV values:\n\`\`\`$CSV\`\`\`"
+          COMMENT="Hello World!"
           PR_NUMBER=$(echo "$GITHUB_REF" | awk 'BEGIN { FS="/" } { print $3 }')
           URL="https://api.github.com/repos/${GITHUB_REPOSITORY}/issues/${PR_NUMBER}/comments"
           curl --request POST --url "$URL" --header "authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" --header "content-type: application/json" --data "{\"body\": \"$COMMENT\"}"
\ No newline at end of file

From c109f036a9bbf1c6ce8b419f47212ecc7b1c5bdf Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Thu, 6 Apr 2023 02:48:42 +0500
Subject: [PATCH 56/67] Modified curl

---
 .github/workflows/actions.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index eb1f3b29..03ffc021 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -34,5 +34,4 @@ jobs:
         run: |
           COMMENT="Hello World!"
           PR_NUMBER=$(echo "$GITHUB_REF" | awk 'BEGIN { FS="/" } { print $3 }')
-          URL="https://api.github.com/repos/${GITHUB_REPOSITORY}/issues/${PR_NUMBER}/comments"
-          curl --request POST --url "$URL" --header "authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" --header "content-type: application/json" --data "{\"body\": \"$COMMENT\"}"
\ No newline at end of file
+          curl -L -X POST -H "Accept: application/vnd.github+json" -H "Authorization: Bearer <YOUR-TOKEN>"-H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/${GITHUB_REPOSITORY}/issues/${PR_NUMBER}/comments -d '{"body":"Me too"}'
\ No newline at end of file

From 23e9a906ac638180b65d65ec6b8b861b6ab25e2d Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Thu, 6 Apr 2023 02:54:11 +0500
Subject: [PATCH 57/67] Fixed cred issue

---
 .github/workflows/actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 03ffc021..76d9cc9f 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -34,4 +34,4 @@ jobs:
         run: |
           COMMENT="Hello World!"
           PR_NUMBER=$(echo "$GITHUB_REF" | awk 'BEGIN { FS="/" } { print $3 }')
-          curl -L -X POST -H "Accept: application/vnd.github+json" -H "Authorization: Bearer <YOUR-TOKEN>"-H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/${GITHUB_REPOSITORY}/issues/${PR_NUMBER}/comments -d '{"body":"Me too"}'
\ No newline at end of file
+          curl -L -X POST -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}"-H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/${GITHUB_REPOSITORY}/issues/${PR_NUMBER}/comments -d '{"body":"Me too"}'
\ No newline at end of file

From 5c744a908efc45924b418933f5ed46268af5b979 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Thu, 6 Apr 2023 03:03:19 +0500
Subject: [PATCH 58/67] Github Token

---
 .github/workflows/actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 76d9cc9f..8143d631 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -34,4 +34,4 @@ jobs:
         run: |
           COMMENT="Hello World!"
           PR_NUMBER=$(echo "$GITHUB_REF" | awk 'BEGIN { FS="/" } { print $3 }')
-          curl -L -X POST -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}"-H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/${GITHUB_REPOSITORY}/issues/${PR_NUMBER}/comments -d '{"body":"Me too"}'
\ No newline at end of file
+          curl -L -X POST -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{ github.token }}"-H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/${GITHUB_REPOSITORY}/issues/${PR_NUMBER}/comments -d '{"body":"Me too"}'
\ No newline at end of file

From b16e6eb9a3da182abed5557d8a21f8b9e1678b6d Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Thu, 6 Apr 2023 03:11:40 +0500
Subject: [PATCH 59/67] Testing GitToken

---
 .github/workflows/actions.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 8143d631..f501dabe 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -30,8 +30,10 @@ jobs:
           name: coverage-report
           path: build/reports/coverage/report.csv
 
-      - name: Print CSV values as a comment in PR
-        run: |
-          COMMENT="Hello World!"
-          PR_NUMBER=$(echo "$GITHUB_REF" | awk 'BEGIN { FS="/" } { print $3 }')
-          curl -L -X POST -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{ github.token }}"-H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/${GITHUB_REPOSITORY}/issues/${PR_NUMBER}/comments -d '{"body":"Me too"}'
\ No newline at end of file
+      - name: Check repository information
+        uses: actions/github-script@v4
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const repo = context.payload.repository.full_name;
+            console.log(`Repository: ${repo}`);
\ No newline at end of file

From 6149f9e635481e10d76c413cbe2aa4c734a6d224 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Thu, 6 Apr 2023 03:18:55 +0500
Subject: [PATCH 60/67] Peter action

---
 .github/workflows/actions.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index f501dabe..c8faa132 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -30,10 +30,11 @@ jobs:
           name: coverage-report
           path: build/reports/coverage/report.csv
 
-      - name: Check repository information
-        uses: actions/github-script@v4
+      - name: Add comment to pull request
+        uses: peter-evans/create-pull-request@v3.12.0
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const repo = context.payload.repository.full_name;
-            console.log(`Repository: ${repo}`);
\ No newline at end of file
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: 'Add comment to PR'
+          title: 'Add comment to PR'
+          body: 'This is a comment added to the pull request!'
+          branch: 'comment-on-pr-${{ steps.pr_number.outputs.number }}'
\ No newline at end of file

From 7c46a61df8dde6d74ac56ce295f94a6cf9e67bbc Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Thu, 6 Apr 2023 03:39:46 +0500
Subject: [PATCH 61/67] Posting comment.

---
 .github/workflows/actions.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index c8faa132..8af0199d 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -30,11 +30,7 @@ jobs:
           name: coverage-report
           path: build/reports/coverage/report.csv
 
-      - name: Add comment to pull request
-        uses: peter-evans/create-pull-request@v3.12.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: 'Add comment to PR'
-          title: 'Add comment to PR'
-          body: 'This is a comment added to the pull request!'
-          branch: 'comment-on-pr-${{ steps.pr_number.outputs.number }}'
\ No newline at end of file
+      - name: Comment on PR
+        run: echo "Hello World" | gh pr comment $(gh pr view --json url | jq -r .url)
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file

From 721467baebe79e281b587e5a08471f32e455b764 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Thu, 6 Apr 2023 03:45:00 +0500
Subject: [PATCH 62/67] Retrying

---
 .github/workflows/actions.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 8af0199d..2f752eac 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -31,6 +31,7 @@ jobs:
           path: build/reports/coverage/report.csv
 
       - name: Comment on PR
-        run: echo "Hello World" | gh pr comment $(gh pr view --json url | jq -r .url)
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+        run: |
+          echo "Hello World" | gh pr comment $(gh pr view --json url | jq -r .url)
\ No newline at end of file

From cf121f2df18ee117e6a2faf6b16d4582e5ee6289 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Thu, 6 Apr 2023 03:52:51 +0500
Subject: [PATCH 63/67] Add comment.

---
 .github/workflows/actions.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 2f752eac..6d8fe532 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -31,7 +31,13 @@ jobs:
           path: build/reports/coverage/report.csv
 
       - name: Comment on PR
-        env:
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-        run: |
-          echo "Hello World" | gh pr comment $(gh pr view --json url | jq -r .url)
\ No newline at end of file
+      - uses: actions/github-script@v3
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            github.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: '👋 Thanks for reporting!'
+            })
\ No newline at end of file

From aec7f3b6bf6082e929107f94f4ffaf2af7c8a75a Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Thu, 6 Apr 2023 03:53:54 +0500
Subject: [PATCH 64/67] Add comment...

---
 .github/workflows/actions.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 6d8fe532..2dbbc469 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -31,7 +31,7 @@ jobs:
           path: build/reports/coverage/report.csv
 
       - name: Comment on PR
-      - uses: actions/github-script@v3
+        uses: actions/github-script@v3
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |

From 0c703d6851c01168f7644b937afc2678d6092d31 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Thu, 6 Apr 2023 03:57:17 +0500
Subject: [PATCH 65/67] Restoring

---
 .github/workflows/actions.yml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 2dbbc469..1798d52d 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -28,16 +28,4 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: coverage-report
-          path: build/reports/coverage/report.csv
-
-      - name: Comment on PR
-        uses: actions/github-script@v3
-        with:
-          github-token: ${{secrets.GITHUB_TOKEN}}
-          script: |
-            github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: '👋 Thanks for reporting!'
-            })
\ No newline at end of file
+          path: build/reports/coverage/report.csv
\ No newline at end of file

From b53214a120e1099fad339001c9558abdd452df11 Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Tue, 18 Apr 2023 07:03:22 +0500
Subject: [PATCH 66/67] Setting code coverage in sonarcloud 1

---
 .github/workflows/actions.yml | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index 1798d52d..c43b8a48 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -18,14 +18,19 @@ jobs:
       - name: Build and run tests with JaCoCo
         run: ./gradlew clean build jacocoTestReport --stacktrace
 
-      - name: Upload test reports
-        uses: actions/upload-artifact@v2
-        with:
-          name: test-reports
-          path: build/test-results/test
-
-      - name: Upload code coverage report
-        uses: actions/upload-artifact@v2
-        with:
-          name: coverage-report
-          path: build/reports/coverage/report.csv
\ No newline at end of file
+      - name: SonarCloud Scan
+        uses: sonarsource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+#      - name: Upload test reports
+#        uses: actions/upload-artifact@v2
+#        with:
+#          name: test-reports
+#          path: build/test-results/test
+#
+#      - name: Upload code coverage report
+#        uses: actions/upload-artifact@v2
+#        with:
+#          name: coverage-report
+#          path: build/reports/coverage/report.csv
\ No newline at end of file

From a9387fdf28cc0e49ad719d08256b795cb3a2fc3b Mon Sep 17 00:00:00 2001
From: syedgulahmed <syedgulahmed@hotmail.com>
Date: Tue, 18 Apr 2023 09:13:01 +0500
Subject: [PATCH 67/67] SonarCloud Token Issue Fixed

---
 .github/workflows/actions.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index c43b8a48..51c16a88 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -23,6 +23,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+
+          
 #      - name: Upload test reports
 #        uses: actions/upload-artifact@v2
 #        with: