Application improvement

Author: SimpleMethod

src/main/java/pl/simplemethod/codebin/githubOauth/GithubRestController.java

@@ -27,6 +27,7 @@ public class GithubRestController {
 
  @Autowired
  private ContainersRepository containersRepository;
+
  /**
  * Returns the necessary information about the repository
  *
@@ -103,6 +104,30 @@ ResponseEntity getInfoAboutOwner(@CookieValue("token") String token) {
  return new ResponseEntity<>(githubClient.getUserInfo(token).toString(), headers, HttpStatus.valueOf(200));
  }
 
+
+ /**
+ * Getting information from the database about a user
+ *
+ * @return Json with data
+ */
+ @GetMapping(value = "/local")
+ public @ResponseBody
+ ResponseEntity checkUserPremium(@CookieValue("id") String id) {
+ org.json.JSONObject body = new org.json.JSONObject();
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_JSON);
+ Users users = usersRepository.getFirstById(Integer.valueOf(id));
+ body.put("user_id", users.getId());
+ body.put("github_id", users.getGithub());
+ if (users.getSubscription() == null) {
+ body.put("subscription_status", "");
+ } else {
+ body.put("subscription_status", users.getSubscription());
+ }
+
+ return new ResponseEntity<>(body.toString(), headers, HttpStatus.valueOf(200));
+ }
+
  /**
  * Returns JSON with user information
  *
@@ -191,14 +216,11 @@ ResponseEntity getpublicrepos(@CookieValue("token") String token) {
  helper.put("created_at", obj1.get("created_at"));
 
  Containers containers = containersRepository.getFirstByName(obj1.get("id").toString());
- if(containers!=null)
- {
- helper.put("container_create", obj1.get("id"));
- 
- }
- else
- {
- helper.put("container_create", null);
+ if (containers != null) {
+ helper.put("container_create", obj1.get("id"));
+
+ } else {
+ helper.put("container_create", null);
  }
  result.add(helper);
  }
@@ -214,4 +236,63 @@ ResponseEntity getpublicrepos(@CookieValue("token") String token) {
 
  }
  }
+
+
+ /**
+ * Returns information about one repository of a logged user
+ *
+ * @param token Token to github authorize
+ * @param repoId The identifier of the repository
+ * @return Json object
+ */
+ @GetMapping("/user/repos/{repoId}")
+ public @ResponseBody
+ ResponseEntity getPublicRepo(@CookieValue("token") String token, @PathVariable(value = "repoId") String repoId) {
+ HttpHeaders headers = new HttpHeaders();
+ headers.setContentType(MediaType.APPLICATION_JSON);
+ JSONParser parser = new JSONParser();
+ org.json.JSONObject body = new org.json.JSONObject();
+ org.json.simple.JSONArray result = new org.json.simple.JSONArray();
+ org.json.simple.JSONObject helper = new org.json.simple.JSONObject();
+ Object obj = null;
+ try {
+ Users users = usersRepository.getFirstByToken(token);
+ if (users == null) {
+ body.put("token", "errr");
+ return new ResponseEntity<>(body.toString(), headers, HttpStatus.valueOf(404));
+ } else {
+ try {
+ obj = parser.parse(githubClient.getUserRepos(token));
+ org.json.simple.JSONArray jsonArray = (org.json.simple.JSONArray) obj;
+ jsonArray.forEach(item -> {
+ org.json.simple.JSONObject obj1 = (org.json.simple.JSONObject) item;
+ if (obj1.get("private").toString().equals("false") && obj1.get("id").toString().equals(repoId)) {
+ helper.put("language", obj1.get("language"));
+ helper.put("id", obj1.get("id"));
+ helper.put("license", obj1.get("license"));
+ helper.put("name", obj1.get("name"));
+ helper.put("git_url", obj1.get("git_url"));
+ helper.put("html_url", obj1.get("html_url"));
+ helper.put("description", obj1.get("description"));
+ helper.put("created_at", obj1.get("created_at"));
+ Containers containers = containersRepository.getFirstByName(obj1.get("id").toString());
+ if (containers != null) {
+ helper.put("container_create", obj1.get("id"));
+ } else {
+ helper.put("container_create", null);
+ }
+
+ }
+ });
+ return new ResponseEntity<>(helper.toString(), headers, HttpStatus.valueOf(200));
+ } catch (NullPointerException | ParseException | org.json.JSONException e) {
+ body.put("token", "errr");
+ return new ResponseEntity<>(body.toString(), headers, HttpStatus.valueOf(404));
+ }
+ }
+ } catch (org.json.JSONException e) {
+ return new ResponseEntity<>(e, headers, HttpStatus.valueOf(404));
+
+ }
+ }
 }

src/main/java/pl/simplemethod/codebin/model/Containers.java

@@ -19,7 +19,7 @@ public class Containers implements Serializable {
  @Column(name = "id_docker", unique = true, nullable = false)
  private String idDocker;
 
- @OneToOne(cascade = CascadeType.ALL)
+ @OneToOne()
  @JoinColumn(name = "id_images", referencedColumnName = "id")
  private Images image;
 

src/main/java/pl/simplemethod/codebin/model/Images.java

@@ -21,9 +21,22 @@ public class Images {
  @Column(name = "type")
  private String type;
 
- public Images(String name, String type) {
+ @NonNull
+ @Column(name = "exec")
+ private String exec;
+
+ public Images(String name, String type, String exec) {
  this.name = name;
  this.type = type;
+ this.exec = exec;
+ }
+
+ public String getExec() {
+ return exec;
+ }
+
+ public void setExec(String exec) {
+ this.exec = exec;
  }
 
  public Images() {

src/main/java/pl/simplemethod/codebin/model/Users.java

@@ -25,7 +25,7 @@ public class Users implements Serializable {
  @Column(name = "role")
  private String role;
 
- @OneToMany
+ @OneToMany(cascade = CascadeType.REMOVE)
  private List<Containers> containers = new ArrayList<>();
 
  public Users() {

src/main/java/pl/simplemethod/codebin/repository/ContainersRepository.java

@@ -13,13 +13,9 @@
 @Transactional
 public interface ContainersRepository extends JpaRepository<Containers, Long> {
 
- Containers removeById(Long id);
+  List<Containers> removeByIdDocker(String name);
 
- Containers deleteByName(String name);
-
- Containers removeByName(String name);
-
- Containers deleteContainersByName(String name);
+ List<Containers> removeAllByIdDocker(String name);
 
  Containers getFirstById(Long id);
 

src/main/java/pl/simplemethod/codebin/repository/UsersRepository.java

@@ -15,5 +15,5 @@ public interface UsersRepository extends JpaRepository<Users, Long> {
 
 Users getFirstByToken(String token);
 
-
+Users getFirstBySubscription(String subscription);
 }

src/main/java/pl/simplemethod/codebin/srv/SrvRestController.java

@@ -107,7 +107,7 @@ ResponseEntity userContainerCheck(@RequestParam("dockergithubid") String dockerG
  */
  @PostMapping("container/create")
  public @ResponseBody
- ResponseEntity createContainerForUser(@RequestParam("dockerimage") String dockerImage, @RequestParam("exposedports") Integer exposedPorts, @RequestParam("hostports") Integer hostPorts, @RequestParam("name") String name, @RequestParam("rammemory") Long ramMemory, @RequestParam("diskquota") Long diskQuota, @CookieValue("id") String id) {
+ ResponseEntity createContainerForUser(@RequestParam("dockerimage") String dockerImage, @RequestParam("exposedports") Integer exposedPorts, @RequestParam("hostports") Integer hostPorts, @RequestParam("name") String name, @RequestParam("rammemory") Long ramMemory, @RequestParam("diskquota") Long diskQuota, @CookieValue("id") String id, @RequestParam("premiumstatus") Integer premiumStatus, @RequestParam("giturl") String gitUrl) {
  HttpHeaders headers = new HttpHeaders();
  headers.setContentType(MediaType.APPLICATION_JSON);
  Images images = imagesRepository.getFirstById(Integer.valueOf(dockerImage));
@@ -118,7 +118,7 @@ ResponseEntity createContainerForUser(@RequestParam("dockerimage") String docker
  status = 200;
  List<Containers> containers = new ArrayList<>();
 
- Containers newContainer = new Containers(name, response.get("id").toString(), images, exposedPorts, hostPorts, ramMemory, diskQuota, linkClient.encrypt(String.valueOf(hostPorts)), 1, Instant.now().getEpochSecond());
+ Containers newContainer = new Containers(name, response.get("id").toString(), images, exposedPorts, hostPorts, ramMemory, diskQuota, linkClient.encrypt(String.valueOf(hostPorts)), premiumStatus, Instant.now().getEpochSecond());
  containers.add(newContainer);
  containers.forEach(containersRepository::save);
  try {
@@ -128,6 +128,19 @@ ResponseEntity createContainerForUser(@RequestParam("dockerimage") String docker
  } catch (NumberFormatException e) {
  return new ResponseEntity<>(e.toString(), headers, HttpStatus.NOT_FOUND);
  }
+
+ try
+ {
+ Thread.sleep(1000);
+ Containers containers1 = containersRepository.getFirstByName(name);
+ response.put("exec", srvClient.execContainer(containers1.getIdDocker(), images.getExec(), gitUrl));
+ }
+ catch (InterruptedException e)
+ {
+
+ }
+
+
  } else {
  status = Integer.valueOf(response.get("status").toString());
  }
@@ -210,7 +223,7 @@ ResponseEntity logsContainer(@PathVariable(value = "ID") String containerId) {
  replaceString = replaceString.replace('�', ' ');
 
  org.json.JSONObject result = new org.json.JSONObject();
- result.put("logs",replaceString);
+ result.put("logs", replaceString);
  return new ResponseEntity<>(result.toString(), headers, HttpStatus.valueOf(201));
  }
 
@@ -255,10 +268,7 @@ ResponseEntity deleteContainer(@PathVariable(value = "ID") String containerId) {
  HttpHeaders headers = new HttpHeaders();
  headers.setContentType(MediaType.APPLICATION_JSON);
  org.json.JSONObject response = srvClient.deleteContainer(containerId);
-
- // TODO: 02.06.2019 Poprawić usuwanie
-
-
+ containersRepository.removeByIdDocker(containerId);
  return new ResponseEntity<>(response.toString(), headers, HttpStatus.valueOf(response.getInt("status")));
  }
 
@@ -276,6 +286,7 @@ ResponseEntity execContainer(@PathVariable(value = "ID") String containerId, @Re
  HttpHeaders headers = new HttpHeaders();
  headers.setContentType(MediaType.APPLICATION_JSON);
  org.json.JSONObject response = srvClient.execContainer(containerId, path, arguments);
+
  return new ResponseEntity<>(response.toString(), headers, HttpStatus.valueOf(response.getInt("status")));
  }