Merge branch 'main' of https://github.com/prgrms-web-devcourse-final-project/WEB5_6_NeogulCoder_BE into feature/EA3-134-study-optimal-time-vote

Author: endorsement0912

src/main/java/grep/neogulcoder/domain/prtemplate/entity/PrTemplate.java

@@ -23,12 +23,11 @@ public class PrTemplate extends BaseEntity {
     private String location;
 
     @Builder
-    private PrTemplate(Long templateId, Long userId, String introduction, String location, Boolean activated) {
+    private PrTemplate(Long templateId, Long userId, String introduction, String location) {
         this.id = templateId;
         this.userId = userId;
         this.introduction = introduction;
         this.location = location;
-        this.activated = activated;
     }
 
     public static PrTemplate PrTemplateInit(Long userId, String introduction, String location) {

src/main/java/grep/neogulcoder/domain/study/controller/dto/request/StudyCreateRequest.java

@@ -66,15 +66,15 @@ private StudyCreateRequest(String name, Category category, int capacity, StudyTy
 
     public Study toEntity(String imageUrl) {
         return Study.builder()
-            .name(this.name)
-            .category(this.category)
-            .capacity(this.capacity)
-            .studyType(this.studyType)
-            .location(this.location)
-            .startDate(this.startDate)
-            .endDate(this.endDate)
-            .introduction(this.introduction)
-            .imageUrl(imageUrl)
-            .build();
+                .name(this.name)
+                .category(this.category)
+                .capacity(this.capacity)
+                .studyType(this.studyType)
+                .location(this.location)
+                .startDate(this.startDate)
+                .endDate(this.endDate)
+                .introduction(this.introduction)
+                .imageUrl(imageUrl)
+                .build();
     }
 }

src/main/java/grep/neogulcoder/global/config/OctetStreamReadMsgConverter.java

@@ -0,0 +1,31 @@
+package grep.neogulcoder.global.config;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.json.AbstractJackson2HttpMessageConverter;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Type;
+
+@Component
+public class OctetStreamReadMsgConverter extends AbstractJackson2HttpMessageConverter {
+
+    public OctetStreamReadMsgConverter(ObjectMapper objectMapper) {
+        super(objectMapper, MediaType.APPLICATION_OCTET_STREAM);
+    }
+
+    @Override
+    public boolean canWrite(Class<?> clazz, MediaType mediaType) {
+        return false;
+    }
+
+    @Override
+    public boolean canWrite(Type type, Class<?> clazz, MediaType mediaType) {
+        return false;
+    }
+
+    @Override
+    protected boolean canWrite(MediaType mediaType) {
+        return false;
+    }
+}

src/main/java/grep/neogulcoder/global/config/WebConfig.java

@@ -2,13 +2,22 @@
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+import java.util.List;
+
 @Configuration
 public class WebConfig implements WebMvcConfigurer {
 
+    private OctetStreamReadMsgConverter octetStreamReadMsgConverter;
+
+    public WebConfig(OctetStreamReadMsgConverter octetStreamReadMsgConverter) {
+        this.octetStreamReadMsgConverter = octetStreamReadMsgConverter;
+    }
+
     @Value("${upload.path}")
     private String uploadPath;
 
@@ -21,7 +30,6 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
             .addResourceLocations("file:" + uploadPath);
     }
 
-
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
@@ -31,4 +39,9 @@ public void addCorsMappings(CorsRegistry registry) {
             .allowCredentials(true)
             .maxAge(3600);
     }
+
+    @Override
+    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+        converters.add(octetStreamReadMsgConverter);
+    }
 }

src/main/resources/data.sql

@@ -1,8 +1,8 @@
-INSERT INTO member (activated, email, password, nickname, profile_image_url, role, oauth_id, oauth_provider) VALUES (true, '[email protected]',  '$2a$10$WZzvlwlN6FVtQvGUXw2CIeNQvT5fPfA4qN99NisD2GOyCeuC4W0t2','&QT5Jklx#t', 'https://www.lorempixel.com/227/245', 'ROLE_ADMIN', NULL, NULL);
-INSERT INTO member (activated, email, password, nickname, profile_image_url, role, oauth_id, oauth_provider) VALUES (true, '[email protected]',  '$2a$10$WZzvlwlN6FVtQvGUXw2CIeNQvT5fPfA4qN99NisD2GOyCeuC4W0t2', '!h1nRU1oKH','https://placeimg.com/350/227/any', 'ROLE_USER', 2139, 'google');
-INSERT INTO member (activated, email, password, nickname, profile_image_url, role, oauth_id, oauth_provider) VALUES (true, '[email protected]',  '$2a$10$WZzvlwlN6FVtQvGUXw2CIeNQvT5fPfA4qN99NisD2GOyCeuC4W0t2', 'm#T99Yfl@*','https://placekitten.com/101/440', 'ROLE_USER', 5741, 'google');
-INSERT INTO member (activated, email, password, nickname, profile_image_url, role, oauth_id, oauth_provider) VALUES (true, '[email protected]',  '$2a$10$WZzvlwlN6FVtQvGUXw2CIeNQvT5fPfA4qN99NisD2GOyCeuC4W0t2','NPy2EpXd$6', 'https://placekitten.com/842/456', 'ROLE_USER', NULL, NULL);
-INSERT INTO member (activated, email, password, nickname, profile_image_url, role, oauth_id, oauth_provider) VALUES (true, '[email protected]',  '$2a$10$WZzvlwlN6FVtQvGUXw2CIeNQvT5fPfA4qN99NisD2GOyCeuC4W0t2', '$c3VDMSkF)','https://placekitten.com/812/623', 'ROLE_ADMIN', NULL, NULL);
+INSERT INTO member (activated, email, password, nickname, profile_image_url, role, oauth_id, oauth_provider) VALUES (true, '[email protected]',  '{bcrypt}$2b$12$TK9zyc6f5qjHE1sSUSULieLOJVDBraWqSz2HRrIKgEKjUES0J2kva','&QT5Jklx#t', 'https://www.lorempixel.com/227/245', 'ROLE_ADMIN', NULL, NULL);
+INSERT INTO member (activated, email, password, nickname, profile_image_url, role, oauth_id, oauth_provider) VALUES (true, '[email protected]',  '{bcrypt}$2b$12$TK9zyc6f5qjHE1sSUSULieLOJVDBraWqSz2HRrIKgEKjUES0J2kva', '!h1nRU1oKH','https://placeimg.com/350/227/any', 'ROLE_USER', 2139, 'google');
+INSERT INTO member (activated, email, password, nickname, profile_image_url, role, oauth_id, oauth_provider) VALUES (true, '[email protected]',  '{bcrypt}$2b$12$TK9zyc6f5qjHE1sSUSULieLOJVDBraWqSz2HRrIKgEKjUES0J2kva', 'm#T99Yfl@*','https://placekitten.com/101/440', 'ROLE_USER', 5741, 'google');
+INSERT INTO member (activated, email, password, nickname, profile_image_url, role, oauth_id, oauth_provider) VALUES (true, '[email protected]',  '{bcrypt}$2b$12$TK9zyc6f5qjHE1sSUSULieLOJVDBraWqSz2HRrIKgEKjUES0J2kva','NPy2EpXd$6', 'https://placekitten.com/842/456', 'ROLE_USER', NULL, NULL);
+INSERT INTO member (activated, email, password, nickname, profile_image_url, role, oauth_id, oauth_provider) VALUES (true, '[email protected]',  '{bcrypt}$2b$12$TK9zyc6f5qjHE1sSUSULieLOJVDBraWqSz2HRrIKgEKjUES0J2kva', '$c3VDMSkF)','https://placekitten.com/812/623', 'ROLE_ADMIN', NULL, NULL);
 INSERT INTO member (activated, email, password, nickname, profile_image_url, role, oauth_id, oauth_provider) VALUES (true,'[email protected]',  '{bcrypt}$2b$12$TK9zyc6f5qjHE1sSUSULieLOJVDBraWqSz2HRrIKgEKjUES0J2kva', 'test','https://placekitten.com/812/624', 'ROLE_USER', NULL, NULL);
 INSERT INTO member (activated, email, password, nickname, profile_image_url, role, oauth_id, oauth_provider) VALUES (true,'[email protected]',  '{bcrypt}$2b$12$TK9zyc6f5qjHE1sSUSULieLOJVDBraWqSz2HRrIKgEKjUES0J2kva', 'test2','https://placekitten.com/812/625', 'ROLE_USER', NULL, NULL);
 INSERT INTO member (activated, email, password, nickname, profile_image_url, role, oauth_id, oauth_provider) VALUES (true,'[email protected]',  '{bcrypt}$2b$12$TK9zyc6f5qjHE1sSUSULieLOJVDBraWqSz2HRrIKgEKjUES0J2kva', 'test3','https://placekitten.com/812/626', 'ROLE_USER', NULL, NULL);