Kylebranch

.gitignore

@@ -1 +1,3 @@
 node_modules
+build
+.DS_Store

Backend/.gitignore

@@ -1,4 +1,5 @@
 .vscode/settings.json
+dropbox.properties
 
 # Created by https://www.gitignore.io/api/java
 # Edit at https://www.gitignore.io/?templates=java

Backend/.vscode/launch.json

@@ -1,5 +1,12 @@
 {
     "configurations": [
+        {
+            "type": "java",
+            "name": "CodeLens (Launch) - DropboxController",
+            "request": "launch",
+            "mainClass": "idealab.api.controller.DropboxController",
+            "projectName": "ideaLab"
+        },
         {
             "type": "java",
             "name": "CodeLens (Launch) - IdeaLabMain",

Backend/build.gradle

@@ -7,7 +7,6 @@ buildscript {
     }
 }
 
-
 apply plugin: 'application'
 apply plugin: 'java'
 apply plugin: 'eclipse'
@@ -38,4 +37,6 @@ dependencies {
     compile("com.auth0:java-jwt:3.4.0")
     testCompile('org.springframework.boot:spring-boot-starter-test')
     testCompile('junit:junit')
+    compile ('com.fasterxml.jackson.core:jackson-core:2.9.9')
+    implementation('com.dropbox.core:dropbox-core-sdk:3.1.1')
 }

Backend/src/main/java/idealab/IdeaLabMain.java

@@ -7,9 +7,11 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 @SpringBootApplication
+@EnableScheduling
 public class IdeaLabMain {
 
     @Autowired

Backend/src/main/java/idealab/api/controller/PrintJobController.java

@@ -1,51 +1,93 @@
 package idealab.api.controller;
 
-import idealab.api.dto.GenericResponse;
-import idealab.api.dto.PrintJobDeleteRequest;
-import idealab.api.dto.PrintJobUpdateRequest;
+import idealab.api.dto.request.PrintJobDeleteRequest;
+import idealab.api.dto.request.PrintJobNewRequest;
+import idealab.api.dto.request.PrintJobUpdateRequest;
+import idealab.api.dto.request.PrintModelUpdateRequest;
+import idealab.api.dto.response.GenericResponse;
+import idealab.api.dto.response.GetAllPrintJobListResponse;
+import idealab.api.dto.response.GetPrintJobDataResponse;
 import idealab.api.operations.PrintJobOperations;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/api/printjobs")
 public class PrintJobController {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(PrintJobController.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(PrintJobController.class); // TODO: Logs should not be in controller
 
     private final PrintJobOperations printJobOperations;
 
     public PrintJobController(PrintJobOperations printJobOperations) {
         this.printJobOperations = printJobOperations;
     }
 
+    @GetMapping
+    public ResponseEntity<GetAllPrintJobListResponse> getAllPrintJobs(){
+        GetAllPrintJobListResponse response = printJobOperations.getAllPrintJobs();
+
+        return ResponseEntity.ok()
+                .contentType(MediaType.APPLICATION_JSON)
+                .body(response);
+    }
+
+    @PostMapping
+    public ResponseEntity<?> printJobNew(@ModelAttribute PrintJobNewRequest model) {
+        LOGGER.info("PrintJobNew request is:" + model.toString());
+        GetPrintJobDataResponse response = printJobOperations.newPrintJob(model);
+
+        return new ResponseEntity<>(response, response.getHttpStatus());
+    }
+
+    @PutMapping("/{printId}/model")
+    public ResponseEntity<?> printJobUpdateModel(@PathVariable("printId") Integer printId,
+                                                  @ModelAttribute PrintModelUpdateRequest model) {
+
+        LOGGER.info("PrintJobUpdateModel request is job:" + printId.toString() + "| model: " + model.toString());
+        GetPrintJobDataResponse response = printJobOperations.updateModel(printId, model);
+
+        return new ResponseEntity<>(response, response.getHttpStatus());
+    }
+
+    @DeleteMapping("/{printId}/model")
+    public ResponseEntity<?> printJobDeleteModel(@PathVariable("printId") Integer printId) {
+        LOGGER.info("PrintJobDeleteModel request is " + printId.toString());
+        GenericResponse response = printJobOperations.deleteModel(printId);
+
+        return new ResponseEntity<>(response, response.getHttpStatus());
+    }
+
     @PutMapping("/{printId}/status")
-    public ResponseEntity<?> printJobUpdateStatus(@PathVariable ("printId") Integer printId, @RequestBody PrintJobUpdateRequest dto)
-    {
+    public ResponseEntity<?> printJobUpdateStatus(@PathVariable ("printId") Integer printId,
+                                                  @RequestBody PrintJobUpdateRequest dto){
+
         LOGGER.info("PrintJobUpdateStatus request is " + dto.toString());
 
         GenericResponse response = printJobOperations.updatePrintJobStatus(printId, dto);
-
-        if(response.isSuccess())
-            return new ResponseEntity<>(response, HttpStatus.ACCEPTED);
-        else
-            return new ResponseEntity<>(response, HttpStatus.BAD_REQUEST);
+        return new ResponseEntity<>(response, response.getHttpStatus());
     }
 
     @DeleteMapping
     public ResponseEntity<?> printJobDelete(@RequestBody PrintJobDeleteRequest dto)
     {
         LOGGER.info("PrintJobDelete request is " + dto.toString());
 
-        GenericResponse response = printJobOperations.deletePrintJobStatus(dto);
-
-        if(response.isSuccess())
-            return new ResponseEntity<>(response, HttpStatus.ACCEPTED);
-        else
-            return new ResponseEntity<>(response, HttpStatus.BAD_REQUEST);
+        GenericResponse response = printJobOperations.deletePrintJob(dto);
+        return new ResponseEntity<>(response, response.getHttpStatus());
     }
 
+    @GetMapping("deletable")
+    public ResponseEntity<GetAllPrintJobListResponse> getDeletablePrintJobs() {
+        LOGGER.info("getDeletablePrintJobs ");
+
+        GetAllPrintJobListResponse response = printJobOperations.getDeletablePrintJobs();
+
+        return ResponseEntity.ok()
+                .contentType(MediaType.APPLICATION_JSON)
+                .body(response);
+    }
 }

Backend/src/main/java/idealab/api/controller/UserController.java

@@ -1,14 +1,13 @@
 package idealab.api.controller;
 
-import idealab.api.dto.GenericResponse;
+import idealab.api.dto.response.GenericResponse;
 import idealab.api.model.Employee;
 import idealab.api.operations.UserOperations;
+import javax.validation.Valid;
+
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/users")
@@ -21,12 +20,15 @@ public UserController(UserOperations userOperations) {
     }
 
     @PostMapping("/sign-up")
-    public ResponseEntity<?> signUp(@RequestBody Employee user) {
+    public ResponseEntity<?> signUp(@RequestBody @Valid Employee user) {
         GenericResponse response = userOperations.userSignUp(user);
-        if(response.isSuccess())
-            return new ResponseEntity<>(response, HttpStatus.CREATED);
-        else
-            return new ResponseEntity<>(response, HttpStatus.BAD_REQUEST);
+        return new ResponseEntity<>(response, response.getHttpStatus());
+    }
+
+    @DeleteMapping("/{id}")
+    public ResponseEntity<?> deleteUser(@PathVariable("id") Integer id) {
+        GenericResponse response = userOperations.deleteUser(id);
+        return new ResponseEntity<>(response, response.getHttpStatus());
     }
 
     /*

Backend/src/main/java/idealab/api/dto/PrintJobDeleteRequest.java → Backend/src/main/java/idealab/api/dto/request/PrintJobDeleteRequest.java

@@ -1,4 +1,4 @@
-package idealab.api.dto;
+package idealab.api.dto.request;
 
 import java.util.Objects;
 

Backend/src/main/java/idealab/api/dto/request/PrintJobNewRequest.java

@@ -0,0 +1,73 @@
+package idealab.api.dto.request;
+
+import org.springframework.web.multipart.MultipartFile;
+
+public class PrintJobNewRequest {
+
+    private String customerFirstName;
+    private String customerLastName;
+    private String email;
+    private String color;
+    private String comments;
+    private MultipartFile file;
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public MultipartFile getFile() {
+        return file;
+    }
+
+    public void setFile(MultipartFile file) {
+        this.file = file;
+    }
+
+    public String getComments() {
+        return comments;
+    }
+
+    public void setComments(String comments) {
+        this.comments = comments;
+    }
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    public String getCustomerFirstName() {
+        return customerFirstName;
+    }
+
+    public void setCustomerFirstName(String customerFirstName) {
+        this.customerFirstName = customerFirstName;
+    }
+
+    public String getCustomerLastName() {
+        return customerLastName;
+    }
+
+    public void setCustomerLastName(String customerLastName) {
+        this.customerLastName = customerLastName;
+    }
+
+    @Override
+    public String toString() {
+        return "PrintJobNewRequest{" +
+                "customerFirstName='" + customerFirstName + '\'' +
+                ", customerLastName='" + customerLastName + '\'' +
+                ", email='" + email + '\'' +
+                ", color='" + color + '\'' +
+                ", comments='" + comments + '\'' +
+                ", file=" + file.getOriginalFilename() +
+                '}';
+    }
+}

Backend/src/main/java/idealab/api/dto/PrintJobUpdateRequest.java → Backend/src/main/java/idealab/api/dto/request/PrintJobUpdateRequest.java

@@ -1,11 +1,7 @@
-package idealab.api.dto;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
+package idealab.api.dto.request;
 
 import java.util.Objects;
 
-import static idealab.api.model.Status.*;
-
 public class PrintJobUpdateRequest {
 
     private Integer employeeId;
@@ -27,28 +23,8 @@ public void setStatus(String status) {
         this.status = status;
     }
 
-    @JsonIgnore
-    public boolean isValidStatus() {
-        if(this.status != null && !this.status.isEmpty()) {
-            if(this.status.equalsIgnoreCase(ARCHIVED.toString()))
-                return true;
-            if(this.status.equalsIgnoreCase(PENDING_CUSTOMER_RESPONSE.toString()))
-                return true;
-            if(this.status.equalsIgnoreCase(PENDING_REVIEW.toString()))
-                return true;
-            if(this.status.equalsIgnoreCase(PRINTING.toString()))
-                return true;
-            if(this.status.equalsIgnoreCase(REJECTED.toString()))
-                return true;
-            if(this.status.equalsIgnoreCase(COMPLETED.toString()))
-                return true;
-            if(this.status.equalsIgnoreCase(FAILED.toString()))
-                return true;
-        }
-        return false;
-    }
-
     //Currently needed for test classes
+    // I think it's better to achieve that without using this. It's bad practice to have a code which is only used for testing purposes ~ kaansonmezoz
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

Backend/src/main/java/idealab/api/dto/request/PrintModelUpdateRequest.java

@@ -0,0 +1,22 @@
+package idealab.api.dto.request;
+
+import org.springframework.web.multipart.MultipartFile;
+
+public class PrintModelUpdateRequest {
+    private MultipartFile file;
+
+    public MultipartFile getFile() {
+        return file;
+    }
+
+    public void setFile(MultipartFile file) {
+        this.file = file;
+    }
+
+    @Override
+    public String toString() {
+        return "PrintModelUpdateRequest{" +
+                "file=" + file.getOriginalFilename() +
+                '}';
+    }
+}