충돌 해결

Author: TTaiJin

src/main/java/com/example/log4u/common/config/AsyncConfig.java

@@ -0,0 +1,23 @@
+package com.example.log4u.common.config;
+
+import java.util.concurrent.Executor;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+@Configuration
+@EnableAsync
+public class AsyncConfig {
+	@Bean(name = "mediaTaskExecutor")
+	public Executor mediaTaskExecutor() {
+		ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+		executor.setCorePoolSize(2);
+		executor.setMaxPoolSize(5);
+		executor.setQueueCapacity(100);
+		executor.setThreadNamePrefix("media-async-");
+		executor.initialize();
+		return executor;
+	}
+}

src/main/java/com/example/log4u/common/config/MySqlConfig.java

@@ -28,7 +28,8 @@
 		"com.example.log4u.domain.reports",
 		"com.example.log4u.domain.supports",
 		"com.example.log4u.domain.user",
-		"com.example.log4u.domain.subscription"
+		"com.example.log4u.domain.subscription",
+		"com.example.log4u.domain.hashtag"
 	},
 	entityManagerFactoryRef = "mysqlEntityManagerFactory",
 	transactionManagerRef = "mysqlTransactionManager"
@@ -57,7 +58,8 @@ public LocalContainerEntityManagerFactoryBean mysqlEntityManagerFactory() {
 			"com.example.log4u.domain.reports",
 			"com.example.log4u.domain.supports",
 			"com.example.log4u.domain.user",
-			"com.example.log4u.domain.subscription"
+			"com.example.log4u.domain.subscription",
+			"com.example.log4u.domain.hashtag"
 		);
 		HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
 		vendorAdapter.setShowSql(true);

src/main/java/com/example/log4u/domain/diary/controller/DiaryController.java

@@ -45,6 +45,18 @@ public ResponseEntity<PageResponse<DiaryResponseDto>> getDiariesByUserId(
 		return ResponseEntity.ok(response);
 	}
 
+	@GetMapping("/users/me")
+	public ResponseEntity<PageResponse<DiaryResponseDto>> getMyDiaries(
+		@AuthenticationPrincipal CustomOAuth2User customOAuth2User,
+		@RequestParam(required = false) Long cursorId,
+		@RequestParam(defaultValue = "12") int size
+	) {
+		PageResponse<DiaryResponseDto> response = diaryFacade.getDiariesByCursor(customOAuth2User.getUserId(),
+			customOAuth2User.getUserId(), cursorId, size);
+
+		return ResponseEntity.ok(response);
+	}
+
 	@PostMapping
 	public ResponseEntity<Void> createDiary(
 		@AuthenticationPrincipal CustomOAuth2User customOAuth2User,
@@ -60,7 +72,7 @@ public ResponseEntity<PageResponse<DiaryResponseDto>> searchDiaries(
 		@RequestParam(required = false) String keyword,
 		@RequestParam(defaultValue = "LATEST") SortType sort,
 		@RequestParam(required = false) Long cursorId,
-		@RequestParam(defaultValue = "6") int size
+		@RequestParam(defaultValue = "12") int size
 	) {
 		return ResponseEntity.ok(
 			diaryFacade.searchDiariesByCursor(keyword, sort, cursorId, size)
@@ -94,4 +106,4 @@ public ResponseEntity<Void> deleteDiary(
 		diaryFacade.deleteDiary(customOAuth2User.getUserId(), diaryId);
 		return ResponseEntity.status(HttpStatus.NO_CONTENT).build();
 	}
-}
+}

src/main/java/com/example/log4u/domain/diary/dto/DiaryRequestDto.java

@@ -36,7 +36,9 @@ public record DiaryRequestDto(
 	@NotNull(message = "미디어 첨부는 필수입니다.")
 	@Size(min = 1, max = 10, message = "미디어는 최소 1개, 최대 10개까지만 업로드 가능합니다.")
 	@Valid
-	List<MediaRequestDto> mediaList
+	List<MediaRequestDto> mediaList,
+
+	List<String> hashtagList
 ) {
 	public static Diary toEntity(Long userId, DiaryRequestDto diaryRequestDto, String thumbnailUrl) {
 		return Diary.builder()

src/main/java/com/example/log4u/domain/diary/dto/DiaryResponseDto.java

@@ -7,13 +7,16 @@
 import com.example.log4u.domain.map.dto.LocationDto;
 import com.example.log4u.domain.media.dto.MediaResponseDto;
 import com.example.log4u.domain.media.entity.Media;
+import com.example.log4u.domain.user.entity.User;
 
 import lombok.Builder;
 
 @Builder
 public record DiaryResponseDto(
 	Long diaryId,
-	Long userId,
+	Long authorId,
+	String authorNickname,
+	String authorProfileImage,
 	LocationDto location,
 	String title,
 	String content,
@@ -24,13 +27,23 @@ public record DiaryResponseDto(
 	String thumbnailUrl,
 	Long likeCount,
 	List<MediaResponseDto> mediaList,
+	List<String> hashtagList,
 	boolean isLiked
 ) {
-	public static DiaryResponseDto of(Diary diary, List<Media> media, boolean isLiked) {
+	// 단건 조회용 (isLiked + User)
+	public static DiaryResponseDto of(
+		Diary diary,
+		List<Media> media,
+		List<String> hashtagList,
+		boolean isLiked,
+		User author
+	) {
 		return DiaryResponseDto.builder()
 			.diaryId(diary.getDiaryId())
-			.userId(diary.getUserId())
-			.location(LocationDto.of(diary.getLocation()))
+			.authorId(diary.getUserId())
+			.authorNickname(author.getNickname())
+			.authorProfileImage(author.getProfileImage())
+			.location(com.example.log4u.domain.map.dto.LocationDto.of(diary.getLocation()))
 			.title(diary.getTitle())
 			.content(diary.getContent())
 			.weatherInfo(diary.getWeatherInfo().name())
@@ -41,12 +54,36 @@ public static DiaryResponseDto of(Diary diary, List<Media> media, boolean isLike
 			.likeCount(diary.getLikeCount())
 			.mediaList(media.stream()
 				.map(MediaResponseDto::of).toList())
+			.hashtagList(hashtagList)
 			.isLiked(isLiked)
 			.build();
 	}
 
-	// 다이어리 목록 반환 시 사용 (isLiked false 기본값)
-	public static DiaryResponseDto of(Diary diary, List<Media> media) {
-		return DiaryResponseDto.of(diary, media, false);
+	// 다이어리 목록 반환 시 사용 (isLiked false, User null 기본값)
+	public static DiaryResponseDto of(
+		Diary diary,
+		List<Media> media,
+		List<String> hashtagList
+	) {
+		return DiaryResponseDto.builder()
+			.diaryId(diary.getDiaryId())
+			.authorId(diary.getUserId())
+			.authorNickname(null)
+			.authorProfileImage(null)
+			.location(com.example.log4u.domain.map.dto.LocationDto.of(diary.getLocation()))
+			.title(diary.getTitle())
+			.content(diary.getContent())
+			.weatherInfo(diary.getWeatherInfo().name())
+			.visibility(diary.getVisibility().name())
+			.createdAt(diary.getCreatedAt())
+			.updatedAt(diary.getUpdatedAt())
+			.thumbnailUrl(diary.getThumbnailUrl())
+			.likeCount(diary.getLikeCount())
+			.mediaList(media.stream()
+				.map(MediaResponseDto::of).toList())
+			.hashtagList(hashtagList)
+			.isLiked(false)
+			.build();
 	}
+
 }

src/main/java/com/example/log4u/domain/diary/facade/DiaryFacade.java

@@ -4,17 +4,21 @@
 
 import org.springframework.data.domain.Slice;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.example.log4u.common.dto.PageResponse;
 import com.example.log4u.domain.diary.SortType;
 import com.example.log4u.domain.diary.dto.DiaryRequestDto;
 import com.example.log4u.domain.diary.dto.DiaryResponseDto;
 import com.example.log4u.domain.diary.entity.Diary;
 import com.example.log4u.domain.diary.service.DiaryService;
+import com.example.log4u.domain.hashtag.service.HashtagService;
 import com.example.log4u.domain.like.service.LikeService;
 import com.example.log4u.domain.map.service.MapService;
 import com.example.log4u.domain.media.entity.Media;
 import com.example.log4u.domain.media.service.MediaService;
+import com.example.log4u.domain.user.entity.User;
+import com.example.log4u.domain.user.service.UserService;
 
 import lombok.RequiredArgsConstructor;
 
@@ -26,6 +30,8 @@ public class DiaryFacade {
 	private final MediaService mediaService;
 	private final MapService mapService;
 	private final LikeService likeService;
+	private final HashtagService hashtagService;
+	private final UserService userService;
 
 	/**
 	 * 다이어리 생성 use case
@@ -35,10 +41,12 @@ public class DiaryFacade {
 	 * 2. mediaService: 해당 다이어리의 이미지 저장<br>
 	 * 3. mapService: 해당 구역 카운트 증가
 	 * */
+	@Transactional
 	public void createDiary(Long userId, DiaryRequestDto request) {
 		String thumbnailUrl = mediaService.extractThumbnailUrl(request.mediaList());
 		Diary diary = diaryService.saveDiary(userId, request, thumbnailUrl);
 		mediaService.saveMedia(diary.getDiaryId(), request.mediaList());
+		hashtagService.saveOrUpdateHashtag(diary.getDiaryId(), request.hashtagList());
 		mapService.increaseRegionDiaryCount(request.location().latitude(), request.location().longitude());
 	}
 
@@ -49,9 +57,11 @@ public void createDiary(Long userId, DiaryRequestDto request) {
 	 * 2. mediaService: 해당 다이어리 이미지 삭제<br>
 	 * 3. diaryService: 다이어리 삭제<br>
 	 * */
+	@Transactional
 	public void deleteDiary(Long userId, Long diaryId) {
-		Diary diary = diaryService.getDiaryAfterValidateOwnership(userId, diaryId);
+		Diary diary = diaryService.getDiaryAfterValidateOwnership(diaryId, userId);
 		mediaService.deleteMediaByDiaryId(diaryId);
+		hashtagService.deleteHashtagsByDiaryId(diaryId);
 		diaryService.deleteDiary(diary);
 	}
 
@@ -62,11 +72,12 @@ public void deleteDiary(Long userId, Long diaryId) {
 	 * 2. mediaService: 해당 다이어리 이미지 삭제<br>
 	 * 3. diaryService: 다이어리 수정
 	 * */
+	@Transactional
 	public void updateDiary(Long userId, Long diaryId, DiaryRequestDto request) {
-		Diary diary = diaryService.getDiaryAfterValidateOwnership(userId, diaryId);
-		if (request.mediaList() != null) {
-			mediaService.updateMediaByDiaryId(diary.getDiaryId(), request.mediaList());
-		}
+		Diary diary = diaryService.getDiaryAfterValidateOwnership(diaryId, userId);
+		mediaService.updateMediaByDiaryId(diary.getDiaryId(), request.mediaList());
+		hashtagService.saveOrUpdateHashtag(diary.getDiaryId(), request.hashtagList());
+
 		String newThumbnailUrl = mediaService.extractThumbnailUrl(request.mediaList());
 		diaryService.updateDiary(diary, request, newThumbnailUrl);
 	}
@@ -79,11 +90,14 @@ public void updateDiary(Long userId, Long diaryId, DiaryRequestDto request) {
 	 * 3. mediaService: 해당 다이어리의 이미지 조회<br>
 	 * 4. 모든 정보 조합 후 dto 변환 해 반환
 	 * */
+	@Transactional(readOnly = true)
 	public DiaryResponseDto getDiary(Long userId, Long diaryId) {
-		Diary diary = diaryService.getDiaryAfterValidateAccess(userId, diaryId);
+		Diary diary = diaryService.getDiaryAfterValidateAccess(diaryId, userId);
+		User user = userService.getUserById(diary.getUserId());
 		boolean isLiked = likeService.isLiked(userId, diaryId);
 		List<Media> media = mediaService.getMediaByDiaryId(diary.getDiaryId());
-		return DiaryResponseDto.of(diary, media, isLiked);
+		List<String> hashtags = hashtagService.getHashtagsByDiaryId(diary.getDiaryId());
+		return DiaryResponseDto.of(diary, media, hashtags, isLiked, user);
 	}
 
 	/**
@@ -93,6 +107,7 @@ public DiaryResponseDto getDiary(Long userId, Long diaryId) {
 	 * 2. nextCursor 정보 생성<br>
 	 * 3. PageResponse 조합 후 반환
 	 * */
+	@Transactional(readOnly = true)
 	public PageResponse<DiaryResponseDto> getDiariesByCursor(
 		Long userId,
 		Long targetUserId,
@@ -112,6 +127,7 @@ public PageResponse<DiaryResponseDto> getDiariesByCursor(
 	 * 2. nextCursor 정보 생성<br>
 	 * 3. PageResponse 조합 후 반환<br>
 	 * */
+	@Transactional(readOnly = true)
 	public PageResponse<DiaryResponseDto> searchDiariesByCursor(
 		String keyword,
 		SortType sort,
@@ -123,5 +139,4 @@ public PageResponse<DiaryResponseDto> searchDiariesByCursor(
 		Long nextCursor = !dtoSlice.isEmpty() ? dtoSlice.getContent().getLast().diaryId() : null;
 		return PageResponse.of(dtoSlice, nextCursor);
 	}
-
-}
+}