commit

src/main/java/com/example/afrishop_v3/controllers/PostController.java

@@ -36,13 +36,13 @@ public class PostController {
     private final VisitRepository visitRepository;
     private final BonusRepository bonusRepository;
     private final HashtagRepository hashtagRepository;
-    private final ItemRepository itemRepository;
+    private final TbCfStationItemRepository itemRepository;
     private final TagRepository tagRepository;
     private final PostHashtagRepository postHashtagRepository;
     private final AuthenticationUser user;
 
 
-    public PostController(PostRepository repository, LikeRepository likeRepository, CommentRepository commentRepository, PostTagRepository postTagRepository, ContentRepository contentRepository, UserRepository userRepository, VisitRepository visitRepository, BonusRepository bonusRepository, HashtagRepository hashtagRepository, ItemRepository itemRepository, TagRepository tagRepository, PostHashtagRepository postHashtagRepository, AuthenticationUser user) {
+    public PostController(PostRepository repository, LikeRepository likeRepository, CommentRepository commentRepository, PostTagRepository postTagRepository, ContentRepository contentRepository, UserRepository userRepository, VisitRepository visitRepository, BonusRepository bonusRepository, HashtagRepository hashtagRepository, TbCfStationItemRepository itemRepository, TagRepository tagRepository, PostHashtagRepository postHashtagRepository, AuthenticationUser user) {
         this.repository = repository;
         this.likeRepository = likeRepository;
         this.commentRepository = commentRepository;
@@ -291,15 +291,16 @@ public class PostController {
 
                             Tag tag = position.getTag();
 
-                            Item item = tag.getItem();
+                            TbCfStationItem item = tag.getStationItem();
 
-                            boolean b = itemRepository.existsByItemId(item.getItemId());
-                            if (b) {
-                                item = itemRepository.findByItemId(item.getItemId());
+                            Optional<TbCfStationItem> itemOptional = itemRepository.findById(item.getItemId());
+
+                            if (itemOptional.isPresent()) {
+                                item = itemOptional.get();
                             } else {
                                 //item = itemRepository.save(item);
                             }
-                            tag.setItem(item);
+                            tag.setStationItem(item);
 
 
                             ContentTag contentTag = new ContentTag();

src/main/java/com/example/afrishop_v3/models/Item.java

@@ -9,6 +9,7 @@ import javax.persistence.Entity;
 @Entity
 @Getter
 @Setter
+@Deprecated
 public class Item extends Model {
     protected String itemName;
     @Column(unique = true)

src/main/java/com/example/afrishop_v3/models/Position.java

@@ -16,7 +16,7 @@ public class Position extends Tag {
     public Tag getTag(){
         Tag tag = new Tag();
         tag.tagName = tagName;
-        tag.setItem(item);
+        tag.setStationItem(stationItem);
 
         return  tag;
     }

src/main/java/com/example/afrishop_v3/models/Tag.java

 package com.example.afrishop_v3.models;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.annotations.Formula;
@@ -13,7 +14,8 @@ import javax.persistence.ManyToOne;
 @Setter
 public class Tag extends Model {
     @ManyToOne(cascade = CascadeType.ALL)
-    protected Item item;
+    @JsonProperty(value = "item")
+    protected TbCfStationItem stationItem;
 
     protected String tagName;
 
@@ -24,11 +26,12 @@ public class Tag extends Model {
         return tagName;
     }
 
-    public Item getItem() {
-        return item;
+    public TbCfStationItem getStationItem() {
+        return stationItem;
     }
 
-    public void setItem(Item item) {
-        this.item = item;
+    public void setStationItem(TbCfStationItem stationItem) {
+        this.stationItem = stationItem;
     }
+
 }