diff --git a/pom.xml b/pom.xml
index bf4b68d..42468b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,6 @@
spring-boot-starter-tomcat
provided
-
com.mysql
mysql-connector-j
@@ -66,7 +65,34 @@
org.eclipse.jgit
6.4.0.202211300538-r
-
+
+ com.h2database
+ h2
+ runtime
+
+
+ junit
+ junit
+ test
+
+
+ org.mockito
+ mockito-core
+ 3.6.28
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
+ 5.9.1
+ test
+
+
+ org.assertj
+ assertj-core
+ 3.4.1
+ test
+
+
diff --git a/src/main/java/com/apside/assistDbBackend/service/GitService.java b/src/main/java/com/apside/assistDbBackend/service/GitService.java
index 9cde681..35a14dd 100644
--- a/src/main/java/com/apside/assistDbBackend/service/GitService.java
+++ b/src/main/java/com/apside/assistDbBackend/service/GitService.java
@@ -19,6 +19,8 @@ public class GitService {
private final String tempDirectoryPath;
+ private UsernamePasswordCredentialsProvider userPass;
+
public GitService(){
tempDirectoryPath = new File(System.getProperty("user.dir")).getParent() + "\\AssistDB_AdditionalFiles";
}
@@ -40,7 +42,9 @@ public class GitService {
git.add().addFilepattern(".").call();
git.commit().setMessage("commited").call();
- git.push().setCredentialsProvider(new UsernamePasswordCredentialsProvider(userGit, accesToken)).call();
+ userPass = new UsernamePasswordCredentialsProvider(userGit, accesToken);
+
+ git.push().setCredentialsProvider(userPass).call();
}
}
diff --git a/src/main/java/com/apside/assistDbBackend/service/ResetDataService.java b/src/main/java/com/apside/assistDbBackend/service/ResetDataService.java
index 89a526b..8612de1 100644
--- a/src/main/java/com/apside/assistDbBackend/service/ResetDataService.java
+++ b/src/main/java/com/apside/assistDbBackend/service/ResetDataService.java
@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import java.io.IOException;
import java.nio.file.Files;
+import java.nio.file.Path;
import java.nio.file.Paths;
@Data
@@ -24,11 +25,19 @@ public class ResetDataService {
@Autowired
private LinkInfoService linkInfoService;
- private static final String tableStr = "table";
- private static final String nameStr = "name";
- private static final String dataTypeStr = "data_type";
- private static final String lengthStr = "length";
- private static final String columnTextStr = "column_text";
+ private String result;
+ private Path path;
+
+ private static final String TABLE_STRING = "table";
+ private static final String NAME_STRING = "name";
+ private static final String DATA_TYPE_STRING = "data_type";
+ private static final String LENGTH_STRING = "length";
+ private static final String COLUMN_TEXT_STRING = "column_text";
+
+ public ResetDataService() throws IOException {
+ path = Paths.get("src/main/resources/assistDbData.json");
+ result = new String(Files.readAllBytes(path));
+ }
public void deleteEverything(){
infoColumnService.truncateMyColumn();
@@ -37,7 +46,6 @@ public class ResetDataService {
}
public void insertEverything() throws IOException {
- String result = new String(Files.readAllBytes(Paths.get("src/main/resources/assistDbData.json")));
JSONArray jo = new JSONArray(result);
for (int i=0; i retrieveScripts() throws IOException, GitAPIException {
gitService.pullFromGit();
List