fix :: conflict 해결

src/main/java/com/mindway/server/v2/MindWayV2Application.java

@@ -4,18 +4,18 @@
 import jakarta.annotation.PostConstruct;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 import java.util.TimeZone;
 
 @EnableScheduling
+@EnableJpaAuditing
 @SpringBootApplication
 public class MindWayV2Application {
 
-	@PostConstruct
-	public void started() {TimeZone.setDefault(TimeZone.getTimeZone("Asia/Seoul"));}
-
 	public static void main(String[] args) {
+		TimeZone.setDefault(TimeZone.getTimeZone("Asia/Seoul"));
 		SpringApplication.run(MindWayV2Application.class, args);
 	}
 

src/main/java/com/mindway/server/v2/domain/notice/converter/NoticeConverter.java

@@ -0,0 +1,10 @@
+package com.mindway.server.v2.domain.notice.converter;
+
+
+import com.mindway.server.v2.domain.notice.entity.Notice;
+import com.mindway.server.v2.domain.notice.presentation.dto.request.NoticeAddRequestDto;
+import com.mindway.server.v2.domain.user.entity.User;
+
+public interface NoticeConverter {
+    Notice toEntity(NoticeAddRequestDto noticeAddRequestDto, User user);
+}

src/main/java/com/mindway/server/v2/domain/notice/converter/impl/NoticeConverterImpl.java

@@ -0,0 +1,19 @@
+package com.mindway.server.v2.domain.notice.converter.impl;
+
+import com.mindway.server.v2.domain.notice.converter.NoticeConverter;
+import com.mindway.server.v2.domain.notice.entity.Notice;
+import com.mindway.server.v2.domain.notice.presentation.dto.request.NoticeAddRequestDto;
+import com.mindway.server.v2.domain.user.entity.User;
+import org.springframework.stereotype.Component;
+
+@Component
+public class NoticeConverterImpl implements NoticeConverter {
+
+    public Notice toEntity(NoticeAddRequestDto noticeAddRequestDto, User user) {
+        return Notice.builder()
+                .title(noticeAddRequestDto.getTitle())
+                .content(noticeAddRequestDto.getContent())
+                .user(user)
+                .build();
+    }
+}

src/main/java/com/mindway/server/v2/domain/notice/entity/Notice.java

@@ -0,0 +1,28 @@
+package com.mindway.server.v2.domain.notice.entity;
+
+import com.mindway.server.v2.domain.user.entity.User;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+@Entity
+@Builder
+public class Notice {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private String title;
+
+    private String content;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id")
+    private User user;
+}

src/main/java/com/mindway/server/v2/domain/notice/exception/NotAccessStudentException.java

@@ -0,0 +1,10 @@
+package com.mindway.server.v2.domain.notice.exception;
+
+import com.mindway.server.v2.global.exception.ErrorCode;
+import com.mindway.server.v2.global.exception.MindWayException;
+
+public class NotAccessStudentException extends MindWayException {
+    public NotAccessStudentException() {
+        super(ErrorCode.NOT_ACCESS_STUDENT);
+    }
+}

src/main/java/com/mindway/server/v2/domain/notice/presentation/NoticeController.java

@@ -0,0 +1,27 @@
+package com.mindway.server.v2.domain.notice.presentation;
+
+import com.mindway.server.v2.domain.notice.presentation.dto.request.NoticeAddRequestDto;
+import com.mindway.server.v2.domain.notice.service.NoticeAddService;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+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;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/v2/notice")
+public class NoticeController {
+
+    private final NoticeAddService noticeAddService;
+
+    @PostMapping
+    public ResponseEntity<Void> addNotice(@Valid @RequestBody NoticeAddRequestDto noticeAddRequestDto) {
+        noticeAddService.execute(noticeAddRequestDto);
+        return ResponseEntity.status(HttpStatus.CREATED).build();
+    }
+
+}

src/main/java/com/mindway/server/v2/domain/notice/presentation/dto/request/NoticeAddRequestDto.java

@@ -0,0 +1,16 @@
+package com.mindway.server.v2.domain.notice.presentation.dto.request;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class NoticeAddRequestDto {
+
+    @NotNull
+    private String title;
+    @NotNull
+    private String content;
+
+}

src/main/java/com/mindway/server/v2/domain/notice/repository/NoticeRepository.java

@@ -0,0 +1,8 @@
+package com.mindway.server.v2.domain.notice.repository;
+
+
+import com.mindway.server.v2.domain.notice.entity.Notice;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface NoticeRepository extends JpaRepository<Notice, Long> {
+}

src/main/java/com/mindway/server/v2/domain/notice/service/NoticeAddService.java

@@ -0,0 +1,7 @@
+package com.mindway.server.v2.domain.notice.service;
+
+import com.mindway.server.v2.domain.notice.presentation.dto.request.NoticeAddRequestDto;
+
+public interface NoticeAddService {
+    void execute(NoticeAddRequestDto noticeAddRequestDto);
+}

src/main/java/com/mindway/server/v2/domain/notice/service/impl/NoticeAddServiceImpl.java

@@ -0,0 +1,33 @@
+package com.mindway.server.v2.domain.notice.service.impl;
+
+import com.mindway.server.v2.domain.notice.converter.NoticeConverter;
+import com.mindway.server.v2.domain.notice.entity.Notice;
+import com.mindway.server.v2.domain.notice.exception.NotAccessStudentException;
+import com.mindway.server.v2.domain.notice.presentation.dto.request.NoticeAddRequestDto;
+import com.mindway.server.v2.domain.notice.repository.NoticeRepository;
+import com.mindway.server.v2.domain.notice.service.NoticeAddService;
+import com.mindway.server.v2.domain.user.entity.Authority;
+import com.mindway.server.v2.domain.user.entity.User;
+import com.mindway.server.v2.domain.user.util.UserUtil;
+import com.mindway.server.v2.global.annotation.ServiceWithTransaction;
+import lombok.RequiredArgsConstructor;
+
+@ServiceWithTransaction
+@RequiredArgsConstructor
+public class NoticeAddServiceImpl implements NoticeAddService {
+
+    private final NoticeConverter noticeConverter;
+    private final NoticeRepository noticeRepository;
+    private final UserUtil userUtil;
+
+    public void execute(NoticeAddRequestDto noticeAddRequestDto) {
+        User user = userUtil.getCurrentUser();
+
+        if (user.getAuthority() == Authority.ROLE_STUDENT)
+            throw new NotAccessStudentException();
+
+        Notice notice = noticeConverter.toEntity(noticeAddRequestDto, user);
+
+        noticeRepository.save(notice);
+    }
+}

src/main/java/com/mindway/server/v2/global/entity/BaseEntity.java

@@ -3,17 +3,22 @@
 import jakarta.persistence.EntityListeners;
 import jakarta.persistence.MappedSuperclass;
 import jakarta.persistence.PrePersist;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.ZonedDateTime;
 
 @MappedSuperclass
 @EntityListeners(AuditingEntityListener.class)
 public class BaseEntity {
-    private ZonedDateTime create_at;
+
+    private LocalDateTime createAt;
 
     @PrePersist
-    public void prePersist() {
-        this.create_at = ZonedDateTime.now();
+    protected void onCreate() {
+        createAt = ZonedDateTime.now(ZoneId.of("Asia/Seoul")).toLocalDateTime();
     }
 }

src/main/java/com/mindway/server/v2/global/security/config/SecurityConfig.java

@@ -1,5 +1,6 @@
 package com.mindway.server.v2.global.security.config;
 
+import com.mindway.server.v2.domain.user.entity.Authority;
 import com.mindway.server.v2.global.security.filter.JwtFilter;
 import com.mindway.server.v2.global.security.handler.JwtAccessDeniedHandler;
 import com.mindway.server.v2.global.security.handler.JwtAuthenticationEntryPoint;
@@ -66,6 +67,9 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                                 // book
                                 .requestMatchers(HttpMethod.POST, "/api/v2/book").authenticated()
 
+                                // notice
+                                .requestMatchers(HttpMethod.POST, "/api/v2/notice").hasAnyAuthority(Authority.ROLE_TEACHER.name(), Authority.ROLE_HELPER.name())
+
 
                                 .anyRequest().authenticated()
                 )