From 182d065b37c2235fea76460394396bb63bced0ff Mon Sep 17 00:00:00 2001 From: Gyubin-Han Date: Thu, 12 Jun 2025 18:43:14 +0900 Subject: [PATCH] =?UTF-8?q?Chore:=20DB=20-=20=EA=B0=81=20ID=20=EC=BB=AC?= =?UTF-8?q?=EB=9F=BC=EC=9D=98=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=ED=83=80?= =?UTF-8?q?=EC=9E=85=20=EB=B0=8F=20Entity=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ReadMe.md | 3 ++- sql/DDL.sql | 12 ++++++------ src/main/java/be/gyu/urlShortener/entity/UrlMap.java | 10 +++++++--- src/main/java/be/gyu/urlShortener/entity/Users.java | 4 +++- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/ReadMe.md b/ReadMe.md index fa1c7e4..44d2376 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -14,6 +14,7 @@ ### 구현 현황 - [x] 개발 환경 구축 - [x] DB 설계 및 Entity 구현 -- [x] URL 단축 알고리즘 구현 +- [x] HTTP(HTTPS) URL 검증 구현 +- [ ] URL 단축 알고리즘 구현 - [ ] URL 단축 저장 및 조회 기능 구현 - [ ] 테스트 및 배포 \ No newline at end of file diff --git a/sql/DDL.sql b/sql/DDL.sql index 732b0ef..08c64c0 100644 --- a/sql/DDL.sql +++ b/sql/DDL.sql @@ -6,7 +6,7 @@ DROP TABLE IF EXISTS url_map; DROP TABLE IF EXISTS users; CREATE TABLE `users`( - `user_id` INT NOT NULL AUTO_INCREMENT, + `user_id` BIGINT NOT NULL AUTO_INCREMENT, `user_email` VARCHAR(100) NOT NULL, `user_password` VARCHAR(30) NOT NULL, `user_nickname` VARCHAR(20) NOT NULL, @@ -15,14 +15,14 @@ CREATE TABLE `users`( ); CREATE TABLE `url_map`( - `url_map_id` INT NOT NULL AUTO_INCREMENT, + `url_map_id` BIGINT NOT NULL AUTO_INCREMENT, `url_map_original` VARCHAR(255) NOT NULL, - `url_map_short` VARCHAR(7) NOT NULL, + `url_map_short` VARCHAR(20) NOT NULL, `url_map_is_active` TINYINT(1) NOT NULL, - `user_id` INT NULL, - `url_map_click` INT NOT NULL DEFAULT 0, + `user_id` BIGINT NULL, + `url_map_click` BIGINT NOT NULL DEFAULT 0, `url_map_created_at` DATETIME NOT NULL, - `url_map_edited_at` DATETIME NOT NULL, + `url_map_updated_at` DATETIME NOT NULL, `url_map_expired_at` DATETIME NULL, PRIMARY KEY(url_map_id), FOREIGN KEY(user_id) REFERENCES users(user_id) diff --git a/src/main/java/be/gyu/urlShortener/entity/UrlMap.java b/src/main/java/be/gyu/urlShortener/entity/UrlMap.java index 0fcb4cc..0081cbd 100644 --- a/src/main/java/be/gyu/urlShortener/entity/UrlMap.java +++ b/src/main/java/be/gyu/urlShortener/entity/UrlMap.java @@ -2,28 +2,32 @@ package be.gyu.urlShortener.entity; import java.time.LocalDateTime; +import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; +import lombok.Builder; import lombok.Getter; @Entity @Getter +@Builder(toBuilder=true) public class UrlMap { @Id @GeneratedValue(strategy=GenerationType.IDENTITY) - private int urlMapId; + private Long urlMapId; private String urlMapOriginal; private String urlMapShort; private boolean urlMapIsActive; @ManyToOne @JoinColumn(name="user_id") private Users user; - private int urlMapClick; + @Column(insertable=false) + private Long urlMapClick; private LocalDateTime urlMapCreatedAt; - private LocalDateTime urlMapEditedAt; + private LocalDateTime urlMapUpdatedAt; private LocalDateTime urlMapExpiredAt; } diff --git a/src/main/java/be/gyu/urlShortener/entity/Users.java b/src/main/java/be/gyu/urlShortener/entity/Users.java index d257e60..e774dd0 100644 --- a/src/main/java/be/gyu/urlShortener/entity/Users.java +++ b/src/main/java/be/gyu/urlShortener/entity/Users.java @@ -6,14 +6,16 @@ import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import lombok.Builder; import lombok.Getter; @Entity @Getter +@Builder public class Users { @Id @GeneratedValue(strategy=GenerationType.IDENTITY) - private int userId; + private Long userId; private String userEmail; private String userPassword; private String userNickname;