Merge pull request #88 from xdorro/dev

Merge v1.0.2

Author: anhnmt

build.gradle

@@ -25,18 +25,24 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+    implementation 'org.springframework.boot:spring-boot-starter-cache'
+    implementation 'org.springframework.session:spring-session-data-redis'
+    implementation 'org.springframework.data:spring-data-commons'
 
     implementation 'org.hibernate.validator:hibernate-validator:7.0.4.Final'
 
     implementation 'org.springframework.session:spring-session-core:2.7.0'
-    implementation 'org.springframework.session:spring-session-data-redis:2.7.0'
+    implementation 'org.springframework.data:spring-data-redis:2.7.0'
+
 
     implementation 'org.apache.commons:commons-lang3:3.12.0'
 
     implementation 'com.google.code.gson:gson:2.9.0'
 
     implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.1.0'
 
+    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
+
     runtimeOnly 'org.postgresql:postgresql:42.3.6'
     compileOnly 'org.projectlombok:lombok'
     developmentOnly 'org.springframework.boot:spring-boot-devtools'

src/main/java/com/example/multikart/Application.java

@@ -3,11 +3,13 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @EnableJpaRepositories("com.example.multikart.repo")
 @EntityScan("com.example.multikart.domain.model")
 @SpringBootApplication
+@EnableCaching
 public class Application {
 
     public static void main(String[] args) {

src/main/java/com/example/multikart/common/Const.java

@@ -9,11 +9,9 @@ public static final class DefaultStatus {
 
     public static final class OrderStatus {
         public static final Integer DELETED = 0;
-        public static final Integer ACTIVE = 1;
-        public static final Integer DISABLED = 2;
-        public static final Integer PENDING = 3;
-        public static final Integer SHIPPING = 4;
-        public static final Integer CANCELED = 5;
-        public static final Integer SHIPPED = 6;
+        public static final Integer PENDING = 1;
+        public static final Integer SHIPPING = 2;
+        public static final Integer CANCELED = 3;
+        public static final Integer SHIPPED = 4;
     }
 }

src/main/java/com/example/multikart/common/Utils.java

@@ -3,12 +3,20 @@
 import com.example.multikart.domain.dto.CartDTO;
 import com.example.multikart.domain.model.Customer;
 import com.example.multikart.domain.model.User;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.text.Normalizer;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.Optional;
 import java.util.regex.Pattern;
 
 public class Utils {
@@ -23,6 +31,12 @@ public static String toSlug(String input) {
         return slug.toLowerCase(Locale.ENGLISH);
     }
 
+    public static String getExtensionByStringHandling(String filename) {
+        return Optional.ofNullable(filename)
+                .filter(f -> f.contains("."))
+                .map(f -> f.substring(filename.lastIndexOf(".") + 1)).orElse("");
+    }
+
     public static boolean checkExistCart(List<CartDTO> carts, long id) {
         return carts.stream().anyMatch(c -> c.getProductId().equals(id));
     }
@@ -58,4 +72,19 @@ public static User getUserSession(HttpSession session) {
 
         return user;
     }
+
+    public static void saveFile(String uploadDir, String filename, MultipartFile multipartFile) throws IOException {
+        Path uploadPath = Paths.get(uploadDir);
+
+        if (!Files.exists(uploadPath)) {
+            Files.createDirectories(uploadPath);
+        }
+
+        try (InputStream inputStream = multipartFile.getInputStream()) {
+            Path filePath = uploadPath.resolve(filename);
+            Files.copy(inputStream, filePath, StandardCopyOption.REPLACE_EXISTING);
+        } catch (IOException ioe) {
+            throw new IOException("Could not save image file: " + filename, ioe);
+        }
+    }
 }

src/main/java/com/example/multikart/config/RedisConfig.java

@@ -0,0 +1,24 @@
+package com.example.multikart.config;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+
+@Configuration
+@EnableConfigurationProperties
+@ConfigurationProperties("redis")
+@Setter
+@Getter
+public class RedisConfig {
+    @Bean
+    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory redisConnectionFactory) {
+        RedisTemplate<String, Object> template = new RedisTemplate<>();
+        template.setConnectionFactory(redisConnectionFactory);
+        return template;
+    }
+}