Skip to content

Commit

Permalink
🐛 Fix Article.kt and ArticleEntity.kt
Browse files Browse the repository at this point in the history
  • Loading branch information
wonseok committed Jan 5, 2025
1 parent 5fed19e commit 73727bc
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 28 deletions.
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
JWT_SECRET_KEY=3/p/xxA8WqVucMcHq1vbUFwnZLcFdh84VVdK0tGFtxM=
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ build/
!**/src/main/**/build/
!**/src/test/**/build/

### ./env ###
JWT_SECRET_KEY=your_secret_key

### STS ###
.apt_generated
.classpath
Expand Down
11 changes: 0 additions & 11 deletions src/main/kotlin/com/toyProject7/karrot/article/ArticleException.kt

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import java.time.Instant
data class Article(
val id: String,
val seller: User,
val buyer: User,
val buyer: User?,
val title: String,
val content: String,
val price: Int,
Expand All @@ -20,7 +20,7 @@ data class Article(
return Article(
id = entity.id!!,
seller = User.fromEntity(entity.seller),
buyer = User.fromEntity(entity.buyer),
buyer = entity.buyer?.let { User.fromEntity(it) },
title = entity.title,
content = entity.content,
price = entity.price,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@ class ArticleController(
) {
@GetMapping("/api/mypage/likes")
fun getLikedArticles(
@AuthUser user: User
@AuthUser user: User,
): ResponseEntity<LikedArticlesResponse> {
val articles = articleService.listLikedArticles(user.userId)
return ResponseEntity.ok(articles)
}

@GetMapping("/api/mypage/sells")
fun getSellingAndSoldArticles(
@AuthUser user: User
@AuthUser user: User,
): ResponseEntity<SellingAndSoldArticlesResponse> {
val articles = articleService.listSellingAndSoldArticles(user.userId)
return ResponseEntity.ok(articles)
}

@GetMapping("/api/mypage/buys")
fun getBoughtArticles(
@AuthUser user: User
@AuthUser user: User,
): ResponseEntity<BoughtArticlesResponse> {
val articles = articleService.listBoughtArticles(user.userId)
return ResponseEntity.ok(articles)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import jakarta.persistence.OneToOne
import java.time.Instant

@Entity(name = "articles")
class ArticleEntity (
class ArticleEntity(
@Id
@GeneratedValue(strategy = GenerationType.UUID)
val id: String? = null,
Expand All @@ -22,7 +22,7 @@ class ArticleEntity (
var seller: UserEntity,
@OneToOne
@JoinColumn(name = "buyer_id")
var buyer: UserEntity,
var buyer: UserEntity? = null,
@Column(columnDefinition = "TEXT")
var title: String,
@Column(columnDefinition = "TEXT")
Expand All @@ -32,7 +32,7 @@ class ArticleEntity (
@Column(name = "is_selled")
var isSelled: Boolean,
@OneToMany(mappedBy = "article")
var articleLikes: List<ArticleLikeEntity> = emptyList(),
var articleLikes: MutableList<ArticleLikeEntity> = mutableListOf(),
@Column(name = "created_at", nullable = false)
var createdAt: Instant,
)
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import jakarta.persistence.ManyToOne
import java.time.Instant

@Entity(name = "article_likes")
class ArticleLikeEntity (
class ArticleLikeEntity(
@Id
@GeneratedValue(strategy = GenerationType.UUID)
val id: String? = null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package com.toyProject7.karrot.article.persistence

import org.springframework.data.jpa.repository.JpaRepository

interface ArticleLikeRepository: JpaRepository<ArticleLikeEntity, String> {
interface ArticleLikeRepository : JpaRepository<ArticleLikeEntity, String> {
fun findAllByUserId(userId: String): List<ArticleLikeEntity>
}

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.toyProject7.karrot.article.persistence

import org.springframework.data.jpa.repository.JpaRepository

interface ArticleRepository: JpaRepository<ArticleEntity, String> {
interface ArticleRepository : JpaRepository<ArticleEntity, String> {
fun findAllByBuyerId(userId: String): List<ArticleEntity>

fun findAllBySellerId(userId: String): List<ArticleEntity>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,17 @@ class ArticleService(

fun listSellingAndSoldArticles(userId: String): SellingAndSoldArticlesResponse {
val articles = articleRepository.findAllBySellerId(userId)
val sellingArticles = articles.filter { !it.isSelled }
.map { Article.fromEntity(it) }
val sellingArticles =
articles.filter { !it.isSelled }
.map { Article.fromEntity(it) }

val soldArticles = articles.filter { it.isSelled }
.map { Article.fromEntity(it) }
val soldArticles =
articles.filter { it.isSelled }
.map { Article.fromEntity(it) }

return SellingAndSoldArticlesResponse(
sellingArticles,
soldArticles
soldArticles,
)
}

Expand Down

0 comments on commit 73727bc

Please sign in to comment.