Merge pull request #603 from bounswe/feature/BE-591-backend-handle-im…

…age-upload #591 Implemented Image upload to resources using amazon s3 bucket.
bounswe · Dec 24, 2023 · 4c35d75 · 4c35d75
2 parents db5d29b + 23a14cc
commit 4c35d75
Show file tree

Hide file tree

Showing 14 changed files with 174 additions and 15 deletions.
diff --git a/resq/backend/resq/pom.xml b/resq/backend/resq/pom.xml
@@ -86,6 +86,16 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-quartz</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.amazonaws</groupId>
+			<artifactId>aws-java-sdk</artifactId>
+			<version>1.11.133</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.3.0</version>
+		</dependency>
 		<!-- https://mvnrepository.com/artifact/com.google.firebase/firebase-admin
 		<dependency>
 			<groupId>com.google.firebase</groupId>

diff --git a/resq/backend/resq/src/main/java/com/groupa1/resq/config/AmazonClient.java b/resq/backend/resq/src/main/java/com/groupa1/resq/config/AmazonClient.java
@@ -0,0 +1,75 @@
+package com.groupa1.resq.config;
+
+import com.amazonaws.auth.AWSCredentials;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.model.CannedAccessControlList;
+import com.amazonaws.services.s3.model.PutObjectRequest;
+import jakarta.annotation.PostConstruct;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Date;
+
+@Service
+public class AmazonClient {
+
+    private AmazonS3 s3client;
+    @Value("${amazonProperties.endpointUrl}")
+    private String endpointUrl;
+
+    @Value("${amazonProperties.bucketName}")
+    private String bucketName;
+
+    @Value("${amazonProperties.accessKey}")
+    private String accessKey;
+
+    @Value("${amazonProperties.secretKey}")
+    private String secretKey;
+
+    @PostConstruct
+    private void initializeAmazon() {
+        AWSCredentials credentials = new BasicAWSCredentials(this.accessKey, this.secretKey);
+        this.s3client = new AmazonS3Client(credentials);
+    }
+
+    private File convertMultiPartToFile(MultipartFile file) throws IOException {
+        File convFile = new File(file.getOriginalFilename());
+        FileOutputStream fos = new FileOutputStream(convFile);
+        fos.write(file.getBytes());
+        fos.close();
+        return convFile;
+    }
+
+    private String generateFileName(MultipartFile multiPart) {
+        return new Date().getTime() + "-" + multiPart.getOriginalFilename().replace(" ", "_");
+    }
+
+    private void uploadFileTos3bucket(String fileName, File file) {
+        s3client.putObject(new PutObjectRequest(bucketName, fileName, file)
+                .withCannedAcl(CannedAccessControlList.PublicRead));
+    }
+
+    public com.groupa1.resq.entity.File uploadFile(MultipartFile multipartFile) {
+        com.groupa1.resq.entity.File fileEntity = new com.groupa1.resq.entity.File();
+        String fileUrl = "";
+        String fileName = generateFileName(multipartFile);
+        try {
+            File file = convertMultiPartToFile(multipartFile);
+            fileUrl = endpointUrl + "/" + bucketName + "/" + fileName;
+            uploadFileTos3bucket(fileName, file);
+            file.delete();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        fileEntity.setFileName(fileName);
+        fileEntity.setFileUrl(fileUrl);
+        fileEntity.setFileType(multipartFile.getContentType());
+        return fileEntity;
+    }
+}
diff --git a/resq/backend/resq/src/main/java/com/groupa1/resq/controller/ResourceController.java b/resq/backend/resq/src/main/java/com/groupa1/resq/controller/ResourceController.java
@@ -1,5 +1,6 @@
 package com.groupa1.resq.controller;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.groupa1.resq.dto.ResourceDto;
 import com.groupa1.resq.entity.enums.EResourceStatus;
 import com.groupa1.resq.request.CreateResourceRequest;
@@ -9,6 +10,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -24,9 +26,10 @@ public class ResourceController {
 
     @PreAuthorize("hasRole('RESPONDER')")
     @PostMapping("/createResource")
-    public ResponseEntity<Object> createResource(@RequestBody CreateResourceRequest createResourceRequest) {
+    public ResponseEntity<Object> createResource(@RequestPart(name = "createResourceRequest") CreateResourceRequest createResourceRequest,
+                                                 @RequestPart(name = "file", required = false) MultipartFile file) {
         log.info("Creating resource with request: " + createResourceRequest.toString());
-        return resourceService.createResource(createResourceRequest);
+        return resourceService.createResource(createResourceRequest, file);
     }
 
     @PreAuthorize("hasRole('RESPONDER') or hasRole('COORDINATOR') or hasRole('VICTIM')")

diff --git a/resq/backend/resq/src/main/java/com/groupa1/resq/converter/ResourceConverter.java b/resq/backend/resq/src/main/java/com/groupa1/resq/converter/ResourceConverter.java
@@ -1,8 +1,8 @@
 package com.groupa1.resq.converter;
 
+import com.groupa1.resq.dto.FileDto;
 import com.groupa1.resq.dto.ResourceDto;
 import com.groupa1.resq.entity.Resource;
-import com.groupa1.resq.entity.enums.ESize;
 import com.groupa1.resq.repository.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -32,7 +32,14 @@ public ResourceDto convertToDto(Resource resource){
         }
 
         if (resource.getSize() != null)
-            resourceDto.setSize(resource.getSize().toString());
+            resourceDto.setSize(resource.getSize());
+        if (resource.getFile() != null){
+            FileDto fileDto = new FileDto();
+            fileDto.setFileName(resource.getFile().getFileName());
+            fileDto.setFileUrl(resource.getFile().getFileUrl());
+            fileDto.setFileType(resource.getFile().getFileType());
+            resourceDto.setFile(fileDto);
+        }
         return resourceDto;
 
     }
@@ -55,7 +62,7 @@ public Resource convertToEntity(ResourceDto resourceDto){
         resource.setLongitude(resourceDto.getLongitude());
         resource.setCreatedAt(resourceDto.getCreatedDate());
         if (resourceDto.getSize() != null)
-            resource.setSize(ESize.valueOf(resourceDto.getSize()));
+            resource.setSize(resourceDto.getSize());
         return resource;
     }
 }
diff --git a/resq/backend/resq/src/main/java/com/groupa1/resq/dto/FileDto.java b/resq/backend/resq/src/main/java/com/groupa1/resq/dto/FileDto.java
@@ -0,0 +1,10 @@
+package com.groupa1.resq.dto;
+
+import lombok.Data;
+
+@Data
+public class FileDto {
+    private String fileName;
+    private String fileUrl;
+    private String fileType;
+}
diff --git a/resq/backend/resq/src/main/java/com/groupa1/resq/dto/ResourceDto.java b/resq/backend/resq/src/main/java/com/groupa1/resq/dto/ResourceDto.java
@@ -1,6 +1,7 @@
 package com.groupa1.resq.dto;
 
 import com.groupa1.resq.entity.enums.EGender;
+import com.groupa1.resq.entity.enums.ESize;
 import com.groupa1.resq.entity.enums.EResourceStatus;
 import jakarta.persistence.Access;
 import lombok.Data;
@@ -21,6 +22,7 @@ public class ResourceDto {
     private BigDecimal latitude;
     private BigDecimal longitude;
     private LocalDateTime createdDate;
-    private String size;
+    private ESize size;
+    private FileDto file;
     private EResourceStatus status;
 }
diff --git a/resq/backend/resq/src/main/java/com/groupa1/resq/entity/File.java b/resq/backend/resq/src/main/java/com/groupa1/resq/entity/File.java
@@ -0,0 +1,23 @@
+package com.groupa1.resq.entity;
+
+import jakarta.persistence.*;
+import lombok.Data;
+
+@Entity
+@Data
+public class File {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private String fileName;
+
+    private String fileType;
+
+    private String fileUrl;
+
+    @OneToOne(mappedBy = "file")
+    private Resource resource;
+
+}
diff --git a/resq/backend/resq/src/main/java/com/groupa1/resq/entity/Resource.java b/resq/backend/resq/src/main/java/com/groupa1/resq/entity/Resource.java
@@ -43,5 +43,10 @@ public class Resource extends BaseEntity {
 
     private BigDecimal latitude;
     private BigDecimal longitude;
+
+    @OneToOne(cascade = CascadeType.ALL)
+    @JoinColumn(name = "file_id", referencedColumnName = "id")
+    private File file;
+
     private EResourceStatus status;
 }
diff --git a/resq/backend/resq/src/main/java/com/groupa1/resq/repository/FileRepository.java b/resq/backend/resq/src/main/java/com/groupa1/resq/repository/FileRepository.java
@@ -0,0 +1,9 @@
+package com.groupa1.resq.repository;
+
+import com.groupa1.resq.entity.File;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface FileRepository extends JpaRepository<File, Long> {
+}
diff --git a/resq/backend/resq/src/main/java/com/groupa1/resq/request/CreateNeedRequest.java b/resq/backend/resq/src/main/java/com/groupa1/resq/request/CreateNeedRequest.java
@@ -1,5 +1,6 @@
 package com.groupa1.resq.request;
 
+import com.groupa1.resq.entity.enums.ESize;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -11,6 +12,6 @@ public class CreateNeedRequest {
     private BigDecimal longitude;
     private String categoryTreeId;
     private Integer quantity;
-    private String size;
+    private ESize size;
     private Boolean isRecurrent;
 }
diff --git a/resq/backend/resq/src/main/java/com/groupa1/resq/request/CreateResourceRequest.java b/resq/backend/resq/src/main/java/com/groupa1/resq/request/CreateResourceRequest.java
@@ -2,8 +2,11 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.groupa1.resq.entity.enums.EGender;
+import com.groupa1.resq.entity.enums.ESize;
 import com.groupa1.resq.entity.enums.EResourceStatus;
 import lombok.Data;
+import org.springframework.lang.Nullable;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
 
@@ -16,6 +19,6 @@ public class CreateResourceRequest {
     private BigDecimal latitude;
     private BigDecimal longitude;
     private EGender gender;
-    private String size;
+    private ESize size;
     private EResourceStatus status; // This field is only for resource update, default is AVAILABLE
 }
diff --git a/resq/backend/resq/src/main/java/com/groupa1/resq/request/UpdateNeedRequest.java b/resq/backend/resq/src/main/java/com/groupa1/resq/request/UpdateNeedRequest.java
@@ -1,5 +1,6 @@
 package com.groupa1.resq.request;
 
+import com.groupa1.resq.entity.enums.ESize;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -11,6 +12,6 @@ public class UpdateNeedRequest {
     private BigDecimal longitude;
     private String categoryTreeId;
     private Integer quantity;
-    private String size;
+    private ESize size;
     private Boolean isRecurent;
 }
diff --git a/resq/backend/resq/src/main/java/com/groupa1/resq/service/NeedService.java b/resq/backend/resq/src/main/java/com/groupa1/resq/service/NeedService.java
@@ -56,7 +56,7 @@ public Long save(Long userId, CreateNeedRequest createNeedRequest) {
         need.setLatitude(createNeedRequest.getLatitude());
         need.setQuantity(createNeedRequest.getQuantity());
         need.setCategoryTreeId(createNeedRequest.getCategoryTreeId());
-        need.setSize(ESize.valueOf(createNeedRequest.getSize()));
+        need.setSize(createNeedRequest.getSize());
         need.setStatus(ENeedStatus.NOT_INVOLVED);
         need.setIsRecurrent(createNeedRequest.getIsRecurrent());
         return needRepository.save(need).getId();
@@ -105,7 +105,7 @@ public ResponseEntity<String> update (UpdateNeedRequest updateNeedRequest, Long
         need.setLatitude(updateNeedRequest.getLatitude());
         need.setQuantity(updateNeedRequest.getQuantity());
         need.setCategoryTreeId(updateNeedRequest.getCategoryTreeId());
-        need.setSize(ESize.valueOf(updateNeedRequest.getSize()));
+        need.setSize(updateNeedRequest.getSize());
         need.setIsRecurrent(updateNeedRequest.getIsRecurent());
         needRepository.save(need);
         return ResponseEntity.ok("Need updated successfully");

diff --git a/resq/backend/resq/src/main/java/com/groupa1/resq/service/ResourceService.java b/resq/backend/resq/src/main/java/com/groupa1/resq/service/ResourceService.java
@@ -1,11 +1,12 @@
 package com.groupa1.resq.service;
 
+import com.groupa1.resq.config.AmazonClient;
 import com.groupa1.resq.converter.ResourceConverter;
 import com.groupa1.resq.dto.ResourceDto;
+import com.groupa1.resq.entity.File;
 import com.groupa1.resq.entity.Resource;
 import com.groupa1.resq.entity.User;
 import com.groupa1.resq.entity.enums.EResourceStatus;
-import com.groupa1.resq.entity.enums.ESize;
 import com.groupa1.resq.exception.EntityNotFoundException;
 import com.groupa1.resq.repository.ResourceRepository;
 import com.groupa1.resq.request.CreateResourceRequest;
@@ -15,6 +16,7 @@
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -35,7 +37,10 @@ public class ResourceService {
     @Autowired
     private ResourceConverter resourceConverter;
 
-    public ResponseEntity<Object> createResource(CreateResourceRequest createResourceRequest) {
+    @Autowired
+    private AmazonClient amazonClient;
+
+    public ResponseEntity<Object> createResource(CreateResourceRequest createResourceRequest, MultipartFile file) {
         if(createResourceRequest.getSenderId() == null) {
             log.error("Sender id is null");
             return ResponseEntity.badRequest().body("Sender id is null");
@@ -56,7 +61,12 @@ public ResponseEntity<Object> createResource(CreateResourceRequest createResourc
         resource.setLatitude(createResourceRequest.getLatitude());
         resource.setQuantity(createResourceRequest.getQuantity());
         resource.setCategoryTreeId(createResourceRequest.getCategoryTreeId());
-        resource.setSize(ESize.valueOf(createResourceRequest.getSize()));
+        resource.setSize(createResourceRequest.getSize());
+        if (file != null && !file.isEmpty()) {
+            File fileEntity = amazonClient.uploadFile(file);
+            fileEntity.setResource(resource);
+            resource.setFile(fileEntity);
+        }
         resource.setStatus(EResourceStatus.AVAILABLE); // default
         resource.setGender(createResourceRequest.getGender());
         Long resourceId = resourceRepository.save(resource).getId();
@@ -69,7 +79,7 @@ public ResponseEntity<String> updateResource(CreateResourceRequest createResourc
         resource.setLatitude(createResourceRequest.getLatitude());
         resource.setLongitude(createResourceRequest.getLongitude());
         resource.setCategoryTreeId(createResourceRequest.getCategoryTreeId());
-        resource.setSize(ESize.valueOf(createResourceRequest.getSize()));
+        resource.setSize(createResourceRequest.getSize());
         resource.setStatus(createResourceRequest.getStatus());
         resourceRepository.save(resource);
         return ResponseEntity.ok("Resource updated successfully");