Skip to content

Commit 511cc06

Browse files
authored
[refactor] #214 BaseTimeEntity 상속 추가
[refactor] #214 BaseTimeEntity 상속 추가
2 parents e863e14 + 4a2dec6 commit 511cc06

15 files changed

Lines changed: 22 additions & 21 deletions

File tree

src/main/java/org/farmsystem/homepage/domain/minigame/dex/entity/Dex.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import jakarta.persistence.*;
44
import lombok.*;
5+
import org.farmsystem.homepage.domain.common.entity.BaseTimeEntity;
56
import org.farmsystem.homepage.domain.minigame.inventory.entity.Goods;
67
import org.farmsystem.homepage.domain.minigame.player.entity.Player;
78

@@ -10,7 +11,7 @@
1011
@Getter
1112
@NoArgsConstructor
1213
@AllArgsConstructor
13-
public class Dex {
14+
public class Dex extends BaseTimeEntity {
1415

1516
@Id
1617
@GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/org/farmsystem/homepage/domain/minigame/dex/service/DexService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public DexResponseDTO addDex(Long userId, DexRequestDTO request) {
3737

3838
// 해당 식물이 store에 존재하는지 확인
3939
Goods goods = goodsRepository.findByGoodsNumber(request.ownedPlant())
40-
.orElseThrow(() -> new BusinessException(ErrorCode.STORE_NOT_FOUND));
40+
.orElseThrow(() -> new BusinessException(ErrorCode.GOODS_NOT_FOUND));
4141
// 이미 등록된 식물인지 확인
4242
if (dexRepository.existsByPlayerAndOwnedPlant(player, goods)) {
4343
throw new BusinessException(ErrorCode.DEX_ALREADY_REGISTERED);

src/main/java/org/farmsystem/homepage/domain/minigame/farm/entity/FarmplotTile.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import jakarta.persistence.*;
44
import lombok.*;
5+
import org.farmsystem.homepage.domain.common.entity.BaseTimeEntity;
56
import org.farmsystem.homepage.domain.minigame.player.entity.Player;
67

78
@Entity
@@ -10,7 +11,7 @@
1011
@NoArgsConstructor
1112
@AllArgsConstructor
1213
@Builder
13-
public class FarmplotTile {
14+
public class FarmplotTile extends BaseTimeEntity {
1415

1516
@Id
1617
@GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/org/farmsystem/homepage/domain/minigame/farm/entity/PlantedPlant.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import jakarta.persistence.*;
44
import lombok.*;
5+
import org.farmsystem.homepage.domain.common.entity.BaseTimeEntity;
56
import org.farmsystem.homepage.domain.minigame.farm.dto.request.TileUpdateRequestDTO;
67
import org.farmsystem.homepage.domain.minigame.player.entity.Player;
78

@@ -12,7 +13,7 @@
1213
@Getter
1314
@NoArgsConstructor
1415
@AllArgsConstructor
15-
public class PlantedPlant {
16+
public class PlantedPlant extends BaseTimeEntity {
1617

1718
@Id
1819
@GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/org/farmsystem/homepage/domain/minigame/garden/entity/GardenTile.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
@NoArgsConstructor
1313
@AllArgsConstructor
1414
@Builder
15-
// TODO: public class Tile | @Table(name = "tile") 은 어때요
15+
1616
public class GardenTile extends BaseTimeEntity {
1717
@Id
1818
@GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/org/farmsystem/homepage/domain/minigame/garden/entity/PlacedObject.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
@NoArgsConstructor
1212
@AllArgsConstructor
1313
@Builder
14-
// TODO: 진수) 이것도 이름 바꾸고 싶은데 고민.. 소은) 그냥 유지하고 placed_object_id 안되나? 꼭 placed를 붙여야 하는 이유가 있다면 그렇게 하는 게 맞는 거 같은데...
15-
// 하연 ) 상관없는데 아이디랑 테이블 명 통일만 해줬으면 좋겠다.
16-
// 소은 ) 인정.
14+
1715
public class PlacedObject extends BaseTimeEntity { //인벤토리에서 보유한 오브젝트 하나를 삭제하고 정원에 하나를 추가하여 배치함.
1816

1917
@Id

src/main/java/org/farmsystem/homepage/domain/minigame/garden/service/GardenService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ private boolean isDefaultGrass(Goods goods) {
5656
//상점에 존재하는 넘버인지 확인
5757
private Goods findStoreOrThrow(Long goodsNumber) {
5858
return goodsRepository.findByGoodsNumber(goodsNumber)
59-
.orElseThrow(() -> new BusinessException(ErrorCode.STORE_NOT_FOUND));
59+
.orElseThrow(() -> new BusinessException(ErrorCode.GOODS_NOT_FOUND));
6060
}
6161

6262

src/main/java/org/farmsystem/homepage/domain/minigame/inventory/entity/Goods.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
@NoArgsConstructor
1010
@AllArgsConstructor
1111
@Builder
12-
// TODO: Goods 대신 Goods 같은 이름으로 바꾸는 것을 추천
13-
// 이유: GardenTile에서 'private Goods tileType;' 이 있는데, 이해하기 어렵다.
14-
// 필드명에서도 store 빼서 한꺼번에 슉슉 정리하고
12+
1513
public class Goods { //enum 대신 오브젝트/식물 넘버와 이름으로 존재하는 전체 오브젝트/식물 관리
1614

1715
@Id

src/main/java/org/farmsystem/homepage/domain/minigame/inventory/entity/Inventory.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
@Builder
1414
public class Inventory extends BaseTimeEntity { //획득한 오브젝트들을 관리하는 인벤토리
1515

16-
// TODO: 각종 ID는 엔티티명_id로 일치시켜주세요! ex. inventoryId (inventory_id)
1716
@Id
1817
@GeneratedValue(strategy = GenerationType.IDENTITY)
1918
@Column(name = "inventory_id", nullable = false)

src/main/java/org/farmsystem/homepage/domain/minigame/inventory/service/InventoryService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public List<InventoryResponseDTO> updateInventoryObject(Long userId, InventoryUp
6666
.orElseThrow(() -> new BusinessException(ErrorCode.PLAYER_NOT_FOUND));
6767

6868
Goods goods = goodsRepository.findByGoodsNumber(requestDTO.objectType())
69-
.orElseThrow(() -> new BusinessException(ErrorCode.STORE_NOT_FOUND));
69+
.orElseThrow(() -> new BusinessException(ErrorCode.GOODS_NOT_FOUND));
7070

7171
Long storeGoodsNumber = requestDTO.objectType();
7272
int newCount = requestDTO.objectCount();

0 commit comments

Comments
 (0)