fix: git 충돌 해결

woowacourse-teams · Oct 18, 2023 · fb43e32 · fb43e32
2 parents 1232bf7 + 0405080
commit fb43e32
Show file tree

Hide file tree

Showing 15 changed files with 401 additions and 66 deletions.
diff --git a/backend/src/main/java/com/mapbefine/mapbefine/admin/application/AdminCommandService.java b/backend/src/main/java/com/mapbefine/mapbefine/admin/application/AdminCommandService.java
@@ -54,6 +54,7 @@ public AdminCommandService(
     public void blockMember(Long memberId) {
         Member member = findMemberById(memberId);
         member.updateStatus(Status.BLOCKED);
+        memberRepository.flush();
 
         deleteAllRelatedMember(member);
     }
@@ -63,11 +64,8 @@ private void deleteAllRelatedMember(Member member) {
         Long memberId = member.getId();
 
         permissionRepository.deleteAllByMemberId(memberId);
-        permissionRepository.flush();
         atlasRepository.deleteAllByMemberId(memberId);
-        atlasRepository.flush();
         bookmarkRepository.deleteAllByMemberId(memberId);
-        bookmarkRepository.flush();
         pinImageRepository.deleteAllByPinIds(pinIds);
         pinRepository.deleteAllByMemberId(memberId);
         topicRepository.deleteAllByMemberId(memberId);
@@ -90,11 +88,8 @@ public void deleteTopic(Long topicId) {
         List<Long> pinIds = extractPinIdsByTopic(topic);
 
         permissionRepository.deleteAllByTopicId(topicId);
-        permissionRepository.flush();
         atlasRepository.deleteAllByTopicId(topicId);
-        atlasRepository.flush();
         bookmarkRepository.deleteAllByTopicId(topicId);
-        bookmarkRepository.flush();
         pinImageRepository.deleteAllByPinIds(pinIds);
         pinRepository.deleteAllByTopicId(topicId);
         topicRepository.deleteById(topicId);

diff --git a/backend/src/main/java/com/mapbefine/mapbefine/atlas/domain/AtlasRepository.java b/backend/src/main/java/com/mapbefine/mapbefine/atlas/domain/AtlasRepository.java
@@ -1,6 +1,9 @@
 package com.mapbefine.mapbefine.atlas.domain;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 @Repository
@@ -10,7 +13,11 @@ public interface AtlasRepository extends JpaRepository<Atlas, Long> {
 
     void deleteByMemberIdAndTopicId(Long memberId, Long topicId);
 
-    void deleteAllByMemberId(Long memberId);
+    @Modifying(clearAutomatically = true)
+    @Query("delete from Atlas a where a.member.id = :memberId")
+    void deleteAllByMemberId(@Param("memberId") Long memberId);
 
-    void deleteAllByTopicId(Long topicId);
+    @Modifying(clearAutomatically = true)
+    @Query("delete from Atlas a where a.topic.id = :topicId")
+    void deleteAllByTopicId(@Param("topicId") Long topicId);
 }
diff --git a/backend/src/main/java/com/mapbefine/mapbefine/bookmark/domain/BookmarkRepository.java b/backend/src/main/java/com/mapbefine/mapbefine/bookmark/domain/BookmarkRepository.java
@@ -2,15 +2,22 @@
 
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface BookmarkRepository extends JpaRepository<Bookmark, Long> {
 
     Optional<Bookmark> findByMemberIdAndTopicId(Long memberId, Long topicId);
 
     boolean existsByMemberIdAndTopicId(Long memberId, Long topicId);
 
-    void deleteAllByMemberId(Long memberId);
+    @Modifying(clearAutomatically = true)
+    @Query("delete from Bookmark b where b.member.id = :memberId")
+    void deleteAllByMemberId(@Param("memberId") Long memberId);
 
-    void deleteAllByTopicId(Long topicId);
+    @Modifying(clearAutomatically = true)
+    @Query("delete from Bookmark b where b.topic.id = :topicId")
+    void deleteAllByTopicId(@Param("topicId") Long topicId);
 
 }
diff --git a/...d/src/main/java/com/mapbefine/mapbefine/history/application/PinHistoryCommandService.java b/...d/src/main/java/com/mapbefine/mapbefine/history/application/PinHistoryCommandService.java
@@ -0,0 +1,31 @@
+package com.mapbefine.mapbefine.history.application;
+
+import com.mapbefine.mapbefine.history.domain.PinHistory;
+import com.mapbefine.mapbefine.history.domain.PinHistoryRepository;
+import com.mapbefine.mapbefine.pin.domain.Pin;
+import com.mapbefine.mapbefine.pin.event.PinUpdateEvent;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Slf4j
+@Transactional
+@Service
+public class PinHistoryCommandService {
+
+    private final PinHistoryRepository pinHistoryRepository;
+
+    public PinHistoryCommandService(PinHistoryRepository pinHistoryRepository) {
+        this.pinHistoryRepository = pinHistoryRepository;
+    }
+
+    @EventListener
+    public void saveHistory(PinUpdateEvent event) {
+        Pin pin = event.pin();
+        pinHistoryRepository.save(new PinHistory(pin, event.member()));
+
+        log.debug("pin history saved for update pin id =: {}", pin.getId());
+    }
+
+}
diff --git a/backend/src/main/java/com/mapbefine/mapbefine/history/domain/PinHistory.java b/backend/src/main/java/com/mapbefine/mapbefine/history/domain/PinHistory.java
@@ -0,0 +1,55 @@
+package com.mapbefine.mapbefine.history.domain;
+
+import static lombok.AccessLevel.PROTECTED;
+
+import com.mapbefine.mapbefine.common.entity.BaseTimeEntity;
+import com.mapbefine.mapbefine.member.domain.Member;
+import com.mapbefine.mapbefine.pin.domain.Pin;
+import com.mapbefine.mapbefine.pin.domain.PinInfo;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+@EntityListeners(AuditingEntityListener.class)
+@Entity
+@NoArgsConstructor(access = PROTECTED)
+@Getter
+public class PinHistory extends BaseTimeEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne
+    @JoinColumn(name = "pin_id", nullable = false)
+    private Pin pin;
+
+    @ManyToOne
+    @JoinColumn(name = "member_id", nullable = false)
+    private Member member;
+
+    @Embedded
+    private PinInfo pinInfo;
+
+    @Column(name = "pin_updated_at", nullable = false)
+    private LocalDateTime pinUpdatedAt;
+
+    public PinHistory(Pin pin, Member member) {
+        this.pin = pin;
+        PinInfo history = pin.getPinInfo();
+        this.pinInfo = PinInfo.of(history.getName(), history.getDescription());
+        this.pinUpdatedAt = pin.getUpdatedAt();
+        this.member = member;
+    }
+
+}
diff --git a/backend/src/main/java/com/mapbefine/mapbefine/history/domain/PinHistoryRepository.java b/backend/src/main/java/com/mapbefine/mapbefine/history/domain/PinHistoryRepository.java
@@ -0,0 +1,10 @@
+package com.mapbefine.mapbefine.history.domain;
+
+import java.util.List;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PinHistoryRepository extends JpaRepository<PinHistory, Long> {
+    List<PinHistory> findAllByPinId(Long pinId);
+}
diff --git a/backend/src/main/java/com/mapbefine/mapbefine/permission/domain/PermissionRepository.java b/backend/src/main/java/com/mapbefine/mapbefine/permission/domain/PermissionRepository.java
@@ -2,15 +2,22 @@
 
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface PermissionRepository extends JpaRepository<Permission, Long> {
 
     List<Permission> findAllByTopicId(Long topicId);
 
     boolean existsByTopicIdAndMemberId(Long topicId, Long memberId);
 
-    void deleteAllByMemberId(Long memberId);
+    @Modifying(clearAutomatically = true)
+    @Query("delete from Permission p where p.member.id = :memberId")
+    void deleteAllByMemberId(@Param("memberId") Long memberId);
 
-    void deleteAllByTopicId(Long topicId);
+    @Modifying(clearAutomatically = true)
+    @Query("delete from Permission p where p.topic.id = :topicId")
+    void deleteAllByTopicId(@Param("topicId") Long topicId);
 
 }
diff --git a/backend/src/main/java/com/mapbefine/mapbefine/pin/application/PinCommandService.java b/backend/src/main/java/com/mapbefine/mapbefine/pin/application/PinCommandService.java
@@ -30,6 +30,7 @@
 import com.mapbefine.mapbefine.pin.dto.request.PinCreateRequest;
 import com.mapbefine.mapbefine.pin.dto.request.PinImageCreateRequest;
 import com.mapbefine.mapbefine.pin.dto.request.PinUpdateRequest;
+import com.mapbefine.mapbefine.pin.event.PinUpdateEvent;
 import com.mapbefine.mapbefine.pin.exception.PinCommentException.PinCommentForbiddenException;
 import com.mapbefine.mapbefine.pin.exception.PinCommentException.PinCommentNotFoundException;
 import com.mapbefine.mapbefine.pin.exception.PinException.PinBadRequestException;
@@ -40,16 +41,20 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Objects;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+@Slf4j
 @Transactional
 @Service
 public class PinCommandService {
 
     private static final double DUPLICATE_LOCATION_DISTANCE_METERS = 10.0;
 
+    private final ApplicationEventPublisher eventPublisher;
     private final ImageService imageService;
     private final PinRepository pinRepository;
     private final LocationRepository locationRepository;
@@ -59,6 +64,7 @@ public class PinCommandService {
     private final PinCommentRepository pinCommentRepository;
 
     public PinCommandService(
+            ApplicationEventPublisher eventPublisher,
             ImageService imageService,
             PinRepository pinRepository,
             LocationRepository locationRepository,
@@ -68,6 +74,7 @@ public PinCommandService(
             PinCommentRepository pinCommentRepository
     ) {
         this.imageService = imageService;
+        this.eventPublisher = eventPublisher;
         this.pinRepository = pinRepository;
         this.locationRepository = locationRepository;
         this.topicRepository = topicRepository;
@@ -94,8 +101,8 @@ public long save(
         );
 
         addPinImagesToPin(images, pin);
-
         pinRepository.save(pin);
+        eventPublisher.publishEvent(new PinUpdateEvent(pin, member));
 
         return pin.getId();
     }
@@ -152,10 +159,12 @@ public void update(
             Long pinId,
             PinUpdateRequest request
     ) {
+        Member member = findMember(authMember.getMemberId());
         Pin pin = findPin(pinId);
         validatePinCreateOrUpdate(authMember, pin.getTopic());
 
         pin.updatePinInfo(request.name(), request.description());
+        eventPublisher.publishEvent(new PinUpdateEvent(pin, member));
     }
 
     private Pin findPin(Long pinId) {

diff --git a/backend/src/main/java/com/mapbefine/mapbefine/pin/domain/Pin.java b/backend/src/main/java/com/mapbefine/mapbefine/pin/domain/Pin.java
@@ -138,6 +138,10 @@ public double getLongitude() {
         return location.getLongitude();
     }
 
+    public String getDescription() {
+        return pinInfo.getDescription();
+    }
+
     public String getRoadBaseAddress() {
         Address address = location.getAddress();
         return address.getRoadBaseAddress();

diff --git a/backend/src/main/java/com/mapbefine/mapbefine/pin/event/PinUpdateEvent.java b/backend/src/main/java/com/mapbefine/mapbefine/pin/event/PinUpdateEvent.java
@@ -0,0 +1,7 @@
+package com.mapbefine.mapbefine.pin.event;
+
+import com.mapbefine.mapbefine.member.domain.Member;
+import com.mapbefine.mapbefine.pin.domain.Pin;
+
+public record PinUpdateEvent(Pin pin, Member member) {
+}
diff --git a/backend/src/main/resources/logback-spring.xml b/backend/src/main/resources/logback-spring.xml
@@ -8,23 +8,25 @@
     <property name="LOG_PATTERN_COLORED"
               value="%green(%d{yyyy-MM-dd HH:mm:ss.SSS}) [%thread] ${PID} %highlight(%-5level) %cyan(%logger) - %msg%n"/>
 
-    <springProfile name="default">
-        <include resource="logback/console-appender.xml"/>
+    <include resource="logback/console-appender.xml"/>
 
-        <root level="INFO">
+    <root level="INFO">
+        <appender-ref ref="CONSOLE"/>
+    </root>
+
+    <springProfile name="test">
+        <logger name="com.mapbefine.mapbefine" level="DEBUG" additivity="false">
             <appender-ref ref="CONSOLE"/>
-        </root>
+        </logger>
     </springProfile>
 
     <springProfile name="dev">
-        <include resource="logback/console-appender.xml"/>
         <include resource="logback/file-hibernate-appender.xml"/>
         <include resource="logback/file-debug-appender.xml"/>
         <include resource="logback/file-warn-appender.xml"/>
         <include resource="logback/file-error-appender.xml"/>
 
         <root level="INFO">
-            <appender-ref ref="CONSOLE"/>
             <appender-ref ref="FILE_WARN"/>
             <appender-ref ref="FILE_ERROR"/>
         </root>
@@ -38,14 +40,12 @@
     </springProfile>
 
     <springProfile name="prod">
-        <include resource="logback/console-appender.xml"/>
         <include resource="logback/file-info-appender.xml"/>
         <include resource="logback/file-warn-appender.xml"/>
         <include resource="logback/file-error-appender.xml"/>
         <include resource="logback/slack-error-appender.xml"/>
 
         <root level="INFO">
-            <appender-ref ref="CONSOLE"/>
             <appender-ref ref="FILE_WARN"/>
             <appender-ref ref="FILE_ERROR"/>
             <appender-ref ref="SLACK_ERROR"/>