From c44a6792135909f2df44ed6fdf8c2d3c71996f51 Mon Sep 17 00:00:00 2001 From: s-choi Date: Thu, 24 Sep 2026 15:32:34 +0900 Subject: [PATCH] =?UTF-8?q?[EDIT]=20category=E3=83=86=E3=83=BC=E3=83=96?= =?UTF-8?q?=E3=83=AB=E3=81=ABUser=E3=83=BB=E5=89=8A=E9=99=A4=E3=83=95?= =?UTF-8?q?=E3=83=A9=E3=82=B0=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=BE?= =?UTF-8?q?=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/app/domain/model/CategoryModel.java | 12 ++++++++++++ .../demo/app/infra/entity/CategoryEntity.java | 10 ++++++++++ .../demo/app/presentation/form/CategoryForm.java | 7 +++++++ 3 files changed, 29 insertions(+) diff --git a/src/main/java/com/example/demo/app/domain/model/CategoryModel.java b/src/main/java/com/example/demo/app/domain/model/CategoryModel.java index 7f270aa..1857f5e 100644 --- a/src/main/java/com/example/demo/app/domain/model/CategoryModel.java +++ b/src/main/java/com/example/demo/app/domain/model/CategoryModel.java @@ -3,6 +3,7 @@ package com.example.demo.app.domain.model; import java.util.List; import com.example.demo.app.infra.entity.CategoryEntity; +import com.example.demo.app.infra.entity.UserEntity; import lombok.AllArgsConstructor; import lombok.Getter; @@ -27,4 +28,15 @@ public class CategoryModel { return categoryEntityList.stream().map(CategoryModel::convertFrom).toList(); } + public static CategoryEntity convertTo(CategoryModel categoryModel, UserEntity userEntity) { + return new CategoryEntity( + categoryModel.getCategoryId(), + categoryModel.getCategoryName(), + categoryModel.getTransactionType(), + userEntity, + 0, + null, + null); + } + } diff --git a/src/main/java/com/example/demo/app/infra/entity/CategoryEntity.java b/src/main/java/com/example/demo/app/infra/entity/CategoryEntity.java index d6a9fc3..17d3ca7 100644 --- a/src/main/java/com/example/demo/app/infra/entity/CategoryEntity.java +++ b/src/main/java/com/example/demo/app/infra/entity/CategoryEntity.java @@ -4,9 +4,12 @@ import java.util.List; import jakarta.persistence.Column; import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import jakarta.persistence.Table; @@ -32,6 +35,13 @@ public class CategoryEntity { @Column(name = "transaction_type", nullable = false) private Integer transactionType; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private UserEntity userEntity; + + @Column(name = "delete_flag") + private Integer deleteFlag; + @OneToMany(mappedBy = "categoryEntity") private List transactionEntity; diff --git a/src/main/java/com/example/demo/app/presentation/form/CategoryForm.java b/src/main/java/com/example/demo/app/presentation/form/CategoryForm.java index 56172c3..76ac65f 100644 --- a/src/main/java/com/example/demo/app/presentation/form/CategoryForm.java +++ b/src/main/java/com/example/demo/app/presentation/form/CategoryForm.java @@ -25,4 +25,11 @@ public class CategoryForm { return categoryModelList.stream().map(CategoryForm::convertFrom).toList(); } + public static CategoryModel convertTo(CategoryForm categoryForm) { + return new CategoryModel( + categoryForm.getCategoryId(), + categoryForm.getCategoryName(), + categoryForm.getTransactionType()); + } + }