diff --git a/src/main/java/com/apside/assist/db/backend/controller/ScriptController.java b/src/main/java/com/apside/assist/db/backend/controller/ScriptController.java index 216f5e6..9c2af19 100644 --- a/src/main/java/com/apside/assist/db/backend/controller/ScriptController.java +++ b/src/main/java/com/apside/assist/db/backend/controller/ScriptController.java @@ -58,8 +58,8 @@ public class ScriptController { } - @GetMapping("/script/add") - public ResponseEntity addScript(@RequestParam("content") String content, @RequestParam("name") String name, @RequestParam("desc") String description, @RequestParam("tagList") List tagsList, @RequestParam("linkid") int linkId) { + @PostMapping("/script/add") + public ResponseEntity addScript(@RequestBody String content, @RequestParam("name") String name, @RequestParam("desc") String description, @RequestParam("tagList") List tagsList, @RequestParam("linkid") int linkId) { log.debug("Start AddScript - Get Request - with name: {}, description: {}, tagsList: {} and linkId: {}", name, description, tagsList, linkId); try { scriptsService.addOneScript(content, name); @@ -71,8 +71,8 @@ public class ScriptController { } } - @GetMapping("/script/edit") - public ResponseEntity editScript(@RequestParam("content") String content, @RequestParam("defaultname") String defaultName, @RequestParam("newname") String newName, @RequestParam("desc") String description, @RequestParam("tagList") List tagsList, @RequestParam("linkid") int linkId) { + @PostMapping("/script/edit") + public ResponseEntity editScript(@RequestBody String content, @RequestParam("defaultname") String defaultName, @RequestParam("newname") String newName, @RequestParam("desc") String description, @RequestParam("tagList") List tagsList, @RequestParam("linkid") int linkId) { log.debug("Start EditScript - Get Request - with defaultName: {}, newName: {}, description: {}, tagsList: {}, linkId: {}", defaultName, newName, description, tagsList, linkId); try { scriptsService.simpleDeleteScript(defaultName); diff --git a/src/main/java/com/apside/assist/db/backend/service/implementation/GitServiceImpl.java b/src/main/java/com/apside/assist/db/backend/service/implementation/GitServiceImpl.java index 3a4330f..b8647ee 100644 --- a/src/main/java/com/apside/assist/db/backend/service/implementation/GitServiceImpl.java +++ b/src/main/java/com/apside/assist/db/backend/service/implementation/GitServiceImpl.java @@ -21,8 +21,6 @@ public class GitServiceImpl implements GitService { private final String tempDirectoryPath; - private UsernamePasswordCredentialsProvider userPass; - public GitServiceImpl(){ tempDirectoryPath = new File(System.getProperty("user.dir")).getParent() + "\\AssistDB_AdditionalFiles"; } @@ -32,23 +30,28 @@ public class GitServiceImpl implements GitService { @Value("${ACCESS_TOKEN_GIT}") private String accesToken; + @Value("${URI_GIT}") + private String uriGit; + private static final String NAME_URI = "origin"; + private static final String COMMIT_MESSAGE = "commited"; + + @Override public void pushToGit() throws IOException, GitAPIException, URISyntaxException { log.debug("Starting pushToGit method."); + pullFromGit(); try (Git git = Git.open(new File(tempDirectoryPath))){ RemoteAddCommand remoteAddCommand = git.remoteAdd(); - remoteAddCommand.setName("origin"); - remoteAddCommand.setUri(new URIish("https://gitea.ci.apside-top.fr/Prudence_Creole/AssistDB_AdditionalFiles.git")); + remoteAddCommand.setName(NAME_URI); + remoteAddCommand.setUri(new URIish(uriGit)); // you can add more settings here if needed remoteAddCommand.call(); git.add().setUpdate(true).addFilepattern(".").call(); git.add().addFilepattern(".").call(); - git.commit().setMessage("commited").call(); + git.commit().setMessage(COMMIT_MESSAGE).call(); - userPass = new UsernamePasswordCredentialsProvider(userGit, accesToken); - - git.push().setCredentialsProvider(userPass).call(); + git.push().setCredentialsProvider(createCredential()).call(); log.info("Push to Git successful."); } catch (IOException|GitAPIException exception){ log.error("Error push from git", exception); @@ -60,7 +63,7 @@ public class GitServiceImpl implements GitService { public void pullFromGit() throws IOException, GitAPIException { log.debug("Starting pullFromGit method."); try (Git git = Git.open(new File(tempDirectoryPath))){ - git.pull().setCredentialsProvider(new UsernamePasswordCredentialsProvider(userGit, accesToken)).setRemote("origin").setRemoteBranchName("main").call(); + git.pull().setCredentialsProvider(createCredential()).setRemote("origin").setRemoteBranchName("main").call(); log.info("Pull from Git successful."); } catch (IOException|GitAPIException exception){ log.error("Error push from git", exception); @@ -68,4 +71,8 @@ public class GitServiceImpl implements GitService { } } + + public UsernamePasswordCredentialsProvider createCredential() { + return new UsernamePasswordCredentialsProvider(userGit, accesToken); + } } diff --git a/src/main/java/com/apside/assist/db/backend/service/implementation/ResetDataServiceImpl.java b/src/main/java/com/apside/assist/db/backend/service/implementation/ResetDataServiceImpl.java index cf50dbf..8d87ba3 100644 --- a/src/main/java/com/apside/assist/db/backend/service/implementation/ResetDataServiceImpl.java +++ b/src/main/java/com/apside/assist/db/backend/service/implementation/ResetDataServiceImpl.java @@ -38,6 +38,10 @@ public class ResetDataServiceImpl implements ResetDataService, InitializingBean private Path path; private static final String TABLE_STRING = "table"; + private static final String SCHEMA_STRING = "schema"; + private static final String DATA_STRING = "data"; + private static final String COLUMN_STRING = "columns"; + private static final String TABLE_TEXT_STRING = "table_text"; private static final String NAME_STRING = "name"; private static final String DATA_TYPE_STRING = "data_type"; private static final String LENGTH_STRING = "length"; @@ -63,15 +67,15 @@ public class ResetDataServiceImpl implements ResetDataService, InitializingBean JSONArray jo = new JSONArray(result); for (int i=0; i