Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

다른 패키지의 Repository를 직접 접근할 수 없도록 몇몇 서비스 구조 수정 #67

Merged
merged 2 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import com.toyProject7.karrot.article.persistence.ArticleLikesRepository
import com.toyProject7.karrot.article.persistence.ArticleRepository
import com.toyProject7.karrot.chatRoom.controller.ChatRoom
import com.toyProject7.karrot.chatRoom.persistence.ChatRoomEntity
import com.toyProject7.karrot.chatRoom.persistence.ChatRoomRepository
import com.toyProject7.karrot.chatRoom.service.ChatRoomService
import com.toyProject7.karrot.image.persistence.ImageUrlEntity
import com.toyProject7.karrot.image.service.ImageService
import com.toyProject7.karrot.user.controller.User
Expand All @@ -29,7 +29,7 @@ class ArticleService(
private val articleLikesRepository: ArticleLikesRepository,
private val userService: UserService,
@Lazy private val imageService: ImageService,
private val chatRoomRepository: ChatRoomRepository,
@Lazy private val chatRoomService: ChatRoomService,
) {
@Transactional
fun postArticle(
Expand Down Expand Up @@ -261,7 +261,7 @@ class ArticleService(
}

fun getChattingUsersByArticle(article: Article): List<User> {
val chatRoomEntities: List<ChatRoomEntity> = chatRoomRepository.findAllByArticleId(article.id)
val chatRoomEntities: List<ChatRoomEntity> = chatRoomService.findAllByArticleId(article.id)
return chatRoomEntities
.map { chatRoomEntity -> ChatRoom.fromEntity(chatRoomEntity, "") }
.map { chatRoom -> chatRoom.buyer }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.toyProject7.karrot.chatRoom.service

import com.toyProject7.karrot.article.ArticleNotFoundException
import com.toyProject7.karrot.article.persistence.ArticleRepository
import com.toyProject7.karrot.article.service.ArticleService
import com.toyProject7.karrot.chatRoom.ChatRoomNotFoundException
import com.toyProject7.karrot.chatRoom.ThisRoomIsNotYoursException
import com.toyProject7.karrot.chatRoom.controller.ChatMessage
Expand All @@ -11,9 +10,9 @@ import com.toyProject7.karrot.chatRoom.persistence.ChatMessageEntity
import com.toyProject7.karrot.chatRoom.persistence.ChatMessageRepository
import com.toyProject7.karrot.chatRoom.persistence.ChatRoomEntity
import com.toyProject7.karrot.chatRoom.persistence.ChatRoomRepository
import com.toyProject7.karrot.user.UserNotFoundException
import com.toyProject7.karrot.user.controller.User
import com.toyProject7.karrot.user.persistence.UserRepository
import com.toyProject7.karrot.user.service.UserService
import org.springframework.data.repository.findByIdOrNull
import org.springframework.stereotype.Service
import org.springframework.transaction.annotation.Transactional
import java.time.Instant
Expand All @@ -22,13 +21,13 @@ import java.time.Instant
class ChatRoomService(
private val chatMessageRepository: ChatMessageRepository,
private val chatRoomRepository: ChatRoomRepository,
private val userRepository: UserRepository,
private val articleRepository: ArticleRepository,
private val userService: UserService,
private val articleService: ArticleService,
) {
@Transactional
fun saveMessage(chatMessage: ChatMessage): ChatMessage {
val chatRoomEntity = chatRoomRepository.findById(chatMessage.chatRoomId).orElseThrow { ChatRoomNotFoundException() }
val senderEntity = userRepository.findByNickname(chatMessage.senderNickname) ?: throw UserNotFoundException()
val chatRoomEntity = chatRoomRepository.findByIdOrNull(chatMessage.chatRoomId) ?: throw ChatRoomNotFoundException()
val senderEntity = userService.getUserEntityByNickname(chatMessage.senderNickname)
val chatMessageEntity =
ChatMessageEntity(
chatRoom = chatRoomEntity,
Expand Down Expand Up @@ -86,9 +85,9 @@ class ChatRoomService(
sellerId: String,
buyerId: String,
): ChatRoom {
val articleEntity = articleRepository.findById(articleId).orElseThrow { ArticleNotFoundException() }
val sellerEntity = userRepository.findById(sellerId).orElseThrow { UserNotFoundException() }
val buyerEntity = userRepository.findById(buyerId).orElseThrow { UserNotFoundException() }
val articleEntity = articleService.getArticleEntityById(articleId)
val sellerEntity = userService.getUserEntityById(sellerId)
val buyerEntity = userService.getUserEntityById(buyerId)
val chatRoomEntity =
ChatRoomEntity(
article = articleEntity,
Expand All @@ -99,4 +98,9 @@ class ChatRoomService(
chatRoomRepository.save(chatRoomEntity)
return ChatRoom.fromEntity(chatRoomEntity, "")
}

@Transactional
fun findAllByArticleId(articleId: Long): List<ChatRoomEntity> {
return chatRoomRepository.findAllByArticleId(articleId)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,25 @@ package com.toyProject7.karrot.manner.service
import com.toyProject7.karrot.manner.controller.MannerType
import com.toyProject7.karrot.manner.persistence.MannerEntity
import com.toyProject7.karrot.manner.persistence.MannerRepository
import com.toyProject7.karrot.profile.ProfileNotFoundException
import com.toyProject7.karrot.profile.controller.Profile
import com.toyProject7.karrot.profile.persistence.ProfileRepository
import com.toyProject7.karrot.user.UserNotFoundException
import com.toyProject7.karrot.user.controller.User
import com.toyProject7.karrot.user.persistence.UserRepository
import com.toyProject7.karrot.profile.service.ProfileService
import com.toyProject7.karrot.user.service.UserService
import org.springframework.stereotype.Service
import org.springframework.transaction.annotation.Transactional

@Service
class MannerService(
private val mannerRepository: MannerRepository,
private val userRepository: UserRepository,
private val profileRepository: ProfileRepository,
private val userService: UserService,
private val profileService: ProfileService,
) {
@Transactional
fun increaseMannerCount(
nickname: String,
mannerType: MannerType,
) {
val userEntity = userRepository.findByNickname(nickname) ?: throw UserNotFoundException()
val user = User.fromEntity(userEntity)
val profileEntity = profileRepository.findByUserId(user.id) ?: throw ProfileNotFoundException()
val userEntity = userService.getUserEntityByNickname(nickname)
val profileEntity = profileService.getProfileEntityByUserId(userEntity.id!!)
val profile = Profile.fromEntity(profileEntity, 0)

val mannerEntity = mannerRepository.findByProfileIdAndMannerType(profile.id, mannerType)
Expand All @@ -42,10 +38,6 @@ class MannerService(
mannerRepository.save(newMannerEntity)
profileEntity.manners += newMannerEntity
}

userEntity.temperature++
userRepository.save(userEntity)

profileRepository.save(profileEntity)
}
}
Loading