From 6119f0eb168839afb16662cb9e4b563798193fa3 Mon Sep 17 00:00:00 2001 From: Chan531 Date: Thu, 16 Jan 2025 09:27:07 +0900 Subject: [PATCH] =?UTF-8?q?chore:=20=EC=9A=A9=EB=9F=89=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=ED=83=80=EC=9E=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../document/dto/request/DocumentCreateRequest.java | 4 ++-- .../dto/response/DeletedDocumentsGetResponse.java | 2 +- .../document/dto/response/DocumentsGetResponse.java | 2 +- .../tiki/server/document/entity/DeletedDocument.java | 2 +- .../java/com/tiki/server/document/entity/Document.java | 2 +- .../tiki/server/document/service/DocumentService.java | 2 +- .../dto/response/DocumentTagGetServiceResponse.java | 2 +- .../com/tiki/server/drive/dto/DriveGetResponse.java | 2 +- .../server/team/dto/response/UsageGetResponse.java | 6 +++--- .../java/com/tiki/server/team/entity/Subscribe.java | 10 +++++----- src/main/java/com/tiki/server/team/entity/Team.java | 8 ++++---- .../java/com/tiki/server/team/service/TeamService.java | 4 ++-- .../dto/response/TimeBlockDetailGetResponse.java | 2 +- .../server/timeblock/service/dto/DocumentTagInfo.java | 2 +- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/tiki/server/document/dto/request/DocumentCreateRequest.java b/src/main/java/com/tiki/server/document/dto/request/DocumentCreateRequest.java index 5cd6ab5f..53a7f24a 100644 --- a/src/main/java/com/tiki/server/document/dto/request/DocumentCreateRequest.java +++ b/src/main/java/com/tiki/server/document/dto/request/DocumentCreateRequest.java @@ -10,7 +10,7 @@ public record DocumentCreateRequest( @NotNull String fileUrl, @Schema(description = "파일 key", example = "....jpg") @NotNull String fileKey, - @Schema(description = "파일 용량", example = "1.23") - @NotNull double capacity + @Schema(description = "파일 용량 (단위 : byte)", example = "123") + @NotNull long capacity ) { } diff --git a/src/main/java/com/tiki/server/document/dto/response/DeletedDocumentsGetResponse.java b/src/main/java/com/tiki/server/document/dto/response/DeletedDocumentsGetResponse.java index 4687d231..0ae4d9c1 100644 --- a/src/main/java/com/tiki/server/document/dto/response/DeletedDocumentsGetResponse.java +++ b/src/main/java/com/tiki/server/document/dto/response/DeletedDocumentsGetResponse.java @@ -25,7 +25,7 @@ private record DeletedDocumentGetResponse( @NotNull long documentId, @NotNull String name, @NotNull String url, - @NotNull double capacity + @NotNull long capacity ) { private static DeletedDocumentGetResponse from(final DeletedDocument deletedDocument) { diff --git a/src/main/java/com/tiki/server/document/dto/response/DocumentsGetResponse.java b/src/main/java/com/tiki/server/document/dto/response/DocumentsGetResponse.java index 4fc386bf..3ba22bc3 100644 --- a/src/main/java/com/tiki/server/document/dto/response/DocumentsGetResponse.java +++ b/src/main/java/com/tiki/server/document/dto/response/DocumentsGetResponse.java @@ -26,7 +26,7 @@ private record DocumentInfoGetResponse( @NotNull long documentId, @NotNull String name, @NotNull String url, - @NotNull double capacity, + @NotNull long capacity, @NotNull LocalDateTime createdTime ) { diff --git a/src/main/java/com/tiki/server/document/entity/DeletedDocument.java b/src/main/java/com/tiki/server/document/entity/DeletedDocument.java index 540dff57..d50d5a38 100644 --- a/src/main/java/com/tiki/server/document/entity/DeletedDocument.java +++ b/src/main/java/com/tiki/server/document/entity/DeletedDocument.java @@ -40,7 +40,7 @@ public class DeletedDocument extends BaseTime { private long teamId; @Column(nullable = false) - private double capacity; + private long capacity; public static DeletedDocument of(final Document document) { return DeletedDocument.builder() diff --git a/src/main/java/com/tiki/server/document/entity/Document.java b/src/main/java/com/tiki/server/document/entity/Document.java index 3dff76f7..dd5389f8 100644 --- a/src/main/java/com/tiki/server/document/entity/Document.java +++ b/src/main/java/com/tiki/server/document/entity/Document.java @@ -38,7 +38,7 @@ public class Document extends BaseTime { private String fileKey; @Column(nullable = false) - private double capacity; + private long capacity; @Column(nullable = false) private long teamId; diff --git a/src/main/java/com/tiki/server/document/service/DocumentService.java b/src/main/java/com/tiki/server/document/service/DocumentService.java index c0d07e49..4f05c92b 100644 --- a/src/main/java/com/tiki/server/document/service/DocumentService.java +++ b/src/main/java/com/tiki/server/document/service/DocumentService.java @@ -136,6 +136,6 @@ private Document saveDocument(final Team team, final Long folderId, final Docume private void restoreTeamUsage(final long teamId, final List deletedDocuments) { Team team = teamFinder.findById(teamId); - team.restoreUsage(deletedDocuments.stream().mapToDouble(DeletedDocument::getCapacity).sum()); + team.restoreUsage(deletedDocuments.stream().mapToLong(DeletedDocument::getCapacity).sum()); } } diff --git a/src/main/java/com/tiki/server/document/service/dto/response/DocumentTagGetServiceResponse.java b/src/main/java/com/tiki/server/document/service/dto/response/DocumentTagGetServiceResponse.java index fd7263c4..bbbe4332 100644 --- a/src/main/java/com/tiki/server/document/service/dto/response/DocumentTagGetServiceResponse.java +++ b/src/main/java/com/tiki/server/document/service/dto/response/DocumentTagGetServiceResponse.java @@ -8,7 +8,7 @@ public record DocumentTagGetServiceResponse( @NotNull long id, @NotNull String fileName, @NotNull String fileUrl, - @NotNull double capacity + @NotNull long capacity ) { public static DocumentTagGetServiceResponse from(final Document document) { diff --git a/src/main/java/com/tiki/server/drive/dto/DriveGetResponse.java b/src/main/java/com/tiki/server/drive/dto/DriveGetResponse.java index c446d49a..dc31f3c0 100644 --- a/src/main/java/com/tiki/server/drive/dto/DriveGetResponse.java +++ b/src/main/java/com/tiki/server/drive/dto/DriveGetResponse.java @@ -29,7 +29,7 @@ private record DocumentGetResponse( @NotNull long documentId, @NotNull String name, @NotNull String url, - @NotNull double capacity, + @NotNull long capacity, @NotNull LocalDateTime createdTime, @NotNull String type ) { diff --git a/src/main/java/com/tiki/server/team/dto/response/UsageGetResponse.java b/src/main/java/com/tiki/server/team/dto/response/UsageGetResponse.java index fc369a66..c182033f 100644 --- a/src/main/java/com/tiki/server/team/dto/response/UsageGetResponse.java +++ b/src/main/java/com/tiki/server/team/dto/response/UsageGetResponse.java @@ -7,11 +7,11 @@ @Builder(access = PRIVATE) public record UsageGetResponse( - @NotNull double capacity, - @NotNull double usage + @NotNull long capacity, + @NotNull long usage ) { - public static UsageGetResponse of(final double capacity, final double usage) { + public static UsageGetResponse of(final long capacity, final long usage) { return UsageGetResponse.builder() .capacity(capacity) .usage(usage) diff --git a/src/main/java/com/tiki/server/team/entity/Subscribe.java b/src/main/java/com/tiki/server/team/entity/Subscribe.java index 5e66fe15..9d380dba 100644 --- a/src/main/java/com/tiki/server/team/entity/Subscribe.java +++ b/src/main/java/com/tiki/server/team/entity/Subscribe.java @@ -4,16 +4,16 @@ @Getter public enum Subscribe { - BASIC(6000, 30000, 30, false), - ADVANCED(13000, 150000, 120, true), - PREMIUM(25000, 500000, 999999, true); + BASIC(6000, 30L * 1073741824, 30, false), + ADVANCED(13000, 150L * 1073741824, 120, true), + PREMIUM(25000, 500L * 1073741824, 999999, true); private final int price; - private final double capacity; + private final long capacity; private final int memberLimit; private final boolean bannerDiscount; - Subscribe(final int price, final double capacity, final int memberLimit, final boolean bannerDiscount) { + Subscribe(final int price, final long capacity, final int memberLimit, final boolean bannerDiscount) { this.price = price; this.capacity = capacity; this.memberLimit = memberLimit; diff --git a/src/main/java/com/tiki/server/team/entity/Team.java b/src/main/java/com/tiki/server/team/entity/Team.java index 2e8cd543..89733e5a 100644 --- a/src/main/java/com/tiki/server/team/entity/Team.java +++ b/src/main/java/com/tiki/server/team/entity/Team.java @@ -59,7 +59,7 @@ public class Team extends BaseTime { private Subscribe subscribe; @Column(nullable = false) - private double usage; + private long usage; private String imageUrl; @@ -109,18 +109,18 @@ public boolean isSameIconUrl(final String iconImageUrl) { return this.iconImageUrl.equals(iconImageUrl); } - public void addUsage(final double capacity) { + public void addUsage(final long capacity) { if (usage + capacity > subscribe.getCapacity()) { throw new TeamException(EXCEED_TEAM_CAPACITY); } usage += capacity; } - public void restoreUsage(final double capacity) { + public void restoreUsage(final long capacity) { usage -= capacity; } - public double getCapacity() { + public long getCapacity() { return subscribe.getCapacity(); } diff --git a/src/main/java/com/tiki/server/team/service/TeamService.java b/src/main/java/com/tiki/server/team/service/TeamService.java index 87adc4d7..46c8fc05 100644 --- a/src/main/java/com/tiki/server/team/service/TeamService.java +++ b/src/main/java/com/tiki/server/team/service/TeamService.java @@ -111,8 +111,8 @@ public void alterAdmin(final long memberId, final long teamId, final long target public UsageGetResponse getCapacityInfo(final long memberId, final long teamId) { memberTeamManagerFinder.findByMemberIdAndTeamId(memberId, teamId); Team team = teamFinder.findById(teamId); - double capacity = team.getCapacity(); - double usage = team.getUsage(); + long capacity = team.getCapacity(); + long usage = team.getUsage(); return UsageGetResponse.of(capacity, usage); } diff --git a/src/main/java/com/tiki/server/timeblock/dto/response/TimeBlockDetailGetResponse.java b/src/main/java/com/tiki/server/timeblock/dto/response/TimeBlockDetailGetResponse.java index 40cfdc6a..2303ed39 100644 --- a/src/main/java/com/tiki/server/timeblock/dto/response/TimeBlockDetailGetResponse.java +++ b/src/main/java/com/tiki/server/timeblock/dto/response/TimeBlockDetailGetResponse.java @@ -28,7 +28,7 @@ private record DocumentDetailGetResponse( @NotNull long documentId, @NotNull String fileName, @NotNull String fileUrl, - @NotNull double capacity, + @NotNull long capacity, @NotNull long tagId ) { diff --git a/src/main/java/com/tiki/server/timeblock/service/dto/DocumentTagInfo.java b/src/main/java/com/tiki/server/timeblock/service/dto/DocumentTagInfo.java index 31e4905d..c4274edb 100644 --- a/src/main/java/com/tiki/server/timeblock/service/dto/DocumentTagInfo.java +++ b/src/main/java/com/tiki/server/timeblock/service/dto/DocumentTagInfo.java @@ -13,7 +13,7 @@ public record DocumentTagInfo( @NotNull long documentId, @NotNull String fileName, @NotNull String fileUrl, - @NotNull double capacity, + @NotNull long capacity, @NotNull long tagId ) {