feat: Implement MinIO and Hibernate

fix: Refactor classes

Author: IlyaLisov

docker-compose.yaml

@@ -5,6 +5,8 @@ volumes:
     driver: local
   db-data:
     driver: local
+  minio-data:
+    driver: local
 
 services:
   app:
@@ -13,6 +15,8 @@ services:
     container_name: tasklist
     depends_on:
       - db
+      - minio
+      - redis
     env_file:
       - .env
     ports:
@@ -37,4 +41,17 @@ services:
       - '6379:6379'
     command: redis-server --save 20 1 --loglevel warning --requirepass ${REDIS_PASSWORD}
     volumes:
-      - cache:/data
+      - cache:/data
+
+  minio:
+    image: minio/minio:latest
+    container_name: minio
+    environment:
+      - MINIO_ROOT_USER=${MINIO_ACCESS_KEY}
+      - MINIO_ROOT_PASSWORD=${MINIO_SECRET_KEY}
+    command: server ~/minio --console-address :9090
+    ports:
+      - '9090:9090'
+      - '9000:9000'
+    volumes:
+      - minio-data:/minio

pom.xml

@@ -24,9 +24,10 @@
         <hibernate-validator.version>8.0.0.Final</hibernate-validator.version>
         <jakarta-validation.version>3.0.2</jakarta-validation.version>
         <jjwt.version>0.11.5</jjwt.version>
-        <mybatis.version>3.0.1</mybatis.version>
         <liquibase.version>4.19.0</liquibase.version>
         <springdoc.version>2.0.2</springdoc.version>
+        <preliquibase.version>1.3.0</preliquibase.version>
+        <minio.version>8.5.3</minio.version>
     </properties>
 
     <dependencies>
@@ -61,18 +62,18 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>${mybatis.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.liquibase</groupId>
             <artifactId>liquibase-core</artifactId>
             <version>${liquibase.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>net.lbruun.springboot</groupId>
+            <artifactId>preliquibase-spring-boot-starter</artifactId>
+            <version>${preliquibase.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
@@ -137,6 +138,12 @@
             <version>${springdoc.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+            <version>${minio.version}</version>
+        </dependency>
+
     </dependencies>
 
     <build>

src/main/java/com/example/tasklist/config/ApplicationConfig.java

@@ -1,8 +1,10 @@
 package com.example.tasklist.config;
 
+import com.example.tasklist.service.props.MinioProperties;
 import com.example.tasklist.web.security.JwtTokenFilter;
 import com.example.tasklist.web.security.JwtTokenProvider;
 import com.example.tasklist.web.security.expression.CustomSecurityExceptionHandler;
+import io.minio.MinioClient;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
@@ -35,6 +37,7 @@ public class ApplicationConfig {
 
     private final JwtTokenProvider tokenProvider;
     private final ApplicationContext applicationContext;
+    private final MinioProperties minioProperties;
 
     @Bean
     public PasswordEncoder passwordEncoder() {
@@ -53,6 +56,14 @@ public MethodSecurityExpressionHandler expressionHandler() {
         return expressionHandler;
     }
 
+    @Bean
+    public MinioClient minioClient() {
+        return MinioClient.builder()
+                .endpoint(minioProperties.getUrl())
+                .credentials(minioProperties.getAccessKey(), minioProperties.getSecretKey())
+                .build();
+    }
+
     @Bean
     public OpenAPI openAPI() {
         return new OpenAPI()

src/main/java/com/example/tasklist/domain/exception/ImageUploadException.java

@@ -0,0 +1,9 @@
+package com.example.tasklist.domain.exception;
+
+public class ImageUploadException extends RuntimeException {
+
+    public ImageUploadException(String message) {
+        super(message);
+    }
+
+}

src/main/java/com/example/tasklist/domain/task/Task.java

@@ -1,17 +1,41 @@
 package com.example.tasklist.domain.task;
 
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
+@Entity
+@Table(name = "tasks")
 @Data
 public class Task implements Serializable {
 
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
+
     private String title;
     private String description;
+
+    @Enumerated(value = EnumType.STRING)
     private Status status;
+
     private LocalDateTime expirationDate;
 
+    @Column(name = "image")
+    @CollectionTable(name = "tasks_images")
+    @ElementCollection
+    private List<String> images;
+
 }

src/main/java/com/example/tasklist/domain/task/TaskImage.java

@@ -0,0 +1,11 @@
+package com.example.tasklist.domain.task;
+
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+@Data
+public class TaskImage {
+
+    private MultipartFile file;
+
+}

src/main/java/com/example/tasklist/domain/user/User.java

@@ -1,21 +1,51 @@
 package com.example.tasklist.domain.user;
 
 import com.example.tasklist.domain.task.Task;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
 import java.util.Set;
 
+@Entity
+@Table(name = "users")
 @Data
 public class User implements Serializable {
 
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
+
     private String name;
     private String username;
     private String password;
+
+    @Transient
     private String passwordConfirmation;
+
+    @Column(name = "role")
+    @ElementCollection(fetch = FetchType.EAGER)
+    @CollectionTable(name = "users_roles")
+    @Enumerated(value = EnumType.STRING)
     private Set<Role> roles;
+
+    @CollectionTable(name = "users_tasks")
+    @OneToMany
+    @JoinColumn(name = "task_id")
     private List<Task> tasks;
 
 }

src/main/java/com/example/tasklist/repository/DataSourceConfig.java

@@ -1,25 +1,19 @@
 package com.example.tasklist.repository;
 
 import com.example.tasklist.domain.task.Task;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
-import java.util.Optional;
 
-@Mapper
-public interface TaskRepository {
+public interface TaskRepository extends JpaRepository<Task, Long> {
 
-    Optional<Task> findById(Long id);
-
-    List<Task> findAllByUserId(Long userId);
-
-    void assignToUserById(@Param("taskId") Long taskId, @Param("userId") Long userId);
-
-    void update(Task task);
-
-    void create(Task task);
-
-    void delete(Long id);
+    @Query(value = """
+            SELECT * FROM tasks t
+            JOIN users_tasks ut ON ut.task_id = t.id
+            WHERE ut.user_id = :userId
+            """, nativeQuery = true)
+    List<Task> findAllByUserId(@Param("userId") Long userId);
 
 }

src/main/java/com/example/tasklist/repository/TaskRepository.java

@@ -1,27 +1,23 @@
 package com.example.tasklist.repository;
 
-import com.example.tasklist.domain.user.Role;
 import com.example.tasklist.domain.user.User;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.Optional;
 
-@Mapper
-public interface UserRepository {
-
-    Optional<User> findById(Long id);
+public interface UserRepository extends JpaRepository<User, Long> {
 
     Optional<User> findByUsername(String username);
 
-    void update(User user);
-
-    void create(User user);
-
-    void insertUserRole(@Param("userId") Long userId, @Param("role") Role role);
-
+    @Query(value = """
+             SELECT exists(
+                           SELECT 1
+                           FROM users_tasks
+                           WHERE user_id = :userId
+                             AND task_id = :taskId)
+            """, nativeQuery = true)
     boolean isTaskOwner(@Param("userId") Long userId, @Param("taskId") Long taskId);
 
-    void delete(Long id);
-
 }