v3.0.0

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
           distribution: 'corretto'
 
       - name: Gradle 셋업, 빌드, 캐시
-        uses: burrunan/gradle-cache-action@3bf23b8dd95e7d2bacf2470132454fe893a178a1
+        uses: burrunan/gradle-cache-action@c15634bb25b7284dc084f38dff4e838048b7feaf
         with:
           arguments: build
           properties: |

.github/workflows/dev-cd.yml

@@ -58,7 +58,7 @@ jobs:
         run: cd /home/runner/work/ListyWave-back/ListyWave-back/
 
       - name: Gradle 셋업, 빌드, 캐싱
-        uses: burrunan/gradle-cache-action@3bf23b8dd95e7d2bacf2470132454fe893a178a1
+        uses: burrunan/gradle-cache-action@c15634bb25b7284dc084f38dff4e838048b7feaf
         with:
           arguments: bootJar
 

.github/workflows/prod-cd.yml

@@ -58,7 +58,7 @@ jobs:
         run: cd /home/runner/work/ListyWave-back/ListyWave-back/
 
       - name: Gradle 셋업, 빌드, 캐싱
-        uses: burrunan/gradle-cache-action@3bf23b8dd95e7d2bacf2470132454fe893a178a1
+        uses: burrunan/gradle-cache-action@c15634bb25b7284dc084f38dff4e838048b7feaf
         with:
           arguments: bootJar
 

build.gradle

@@ -27,6 +27,7 @@ dependencies {
     annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
 
     // jwt
     implementation 'io.jsonwebtoken:jjwt-api:0.12.4'

src/main/java/com/listywave/admin/Admin.java

@@ -0,0 +1,45 @@
+package com.listywave.admin;
+
+import static com.listywave.common.exception.ErrorCode.INVALID_ACCESS;
+import static jakarta.persistence.GenerationType.IDENTITY;
+import static lombok.AccessLevel.PROTECTED;
+
+import com.listywave.common.exception.CustomException;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Getter
+@NoArgsConstructor(access = PROTECTED)
+@AllArgsConstructor
+public class Admin {
+
+    @Id
+    @GeneratedValue(strategy = IDENTITY)
+    private Long id;
+
+    @Column(nullable = false, length = 40, unique = true)
+    private String ip;
+
+    @Column(nullable = false, length = 50, unique = true)
+    private String account;
+
+    @Column(nullable = false, length = 50)
+    private String password;
+
+    public void validatePassword(String password) {
+        if (this.password.equals(password)) {
+            return;
+        }
+        throw new CustomException(INVALID_ACCESS);
+    }
+
+    public void update(String password) {
+        this.password = password;
+    }
+}

src/main/java/com/listywave/admin/AdminController.java

@@ -0,0 +1,55 @@
+package com.listywave.admin;
+
+import com.listywave.common.auth.Auth;
+import com.listywave.common.exception.CustomException;
+import static com.listywave.common.exception.ErrorCode.RESOURCE_NOT_FOUND;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
+import org.springframework.core.env.Environment;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@Controller
+@RequiredArgsConstructor
+public class AdminController {
+
+    private final Environment environment;
+    private final AdminService adminService;
+
+    @GetMapping("/admin")
+    String redirectLoginPage(HttpServletRequest request) {
+        String clientIp = request.getHeader("X-Forwarded-For");
+
+        if (adminService.isValidIp(clientIp)) {
+            String[] activeProfiles = environment.getActiveProfiles();
+
+            for (String activeProfile : activeProfiles) {
+                switch (activeProfile) {
+                    case "dev", "default" -> {
+                        return "redirect:http://localhost:3000/admin/login";
+                    }
+                    case "prod" -> {
+                        return "redirect:https://listywave.com/admin/login";
+                    }
+                }
+            }
+        }
+        throw new CustomException(RESOURCE_NOT_FOUND);
+    }
+
+    @PostMapping("/admin/login")
+    ResponseEntity<AdminLoginResponse> login(@RequestBody AdminLoginRequest adminLoginRequest) {
+        AdminLoginResponse result = adminService.login(adminLoginRequest.account(), adminLoginRequest.password());
+        return ResponseEntity.ok(result);
+    }
+
+    @PutMapping("/admin")
+    ResponseEntity<Void> updateInfo(@Auth Long adminId, @RequestBody AdminUpdateRequest request) {
+        adminService.update(adminId, request.password());
+        return ResponseEntity.ok().build();
+    }
+}

src/main/java/com/listywave/admin/AdminLoginRequest.java

@@ -0,0 +1,7 @@
+package com.listywave.admin;
+
+public record AdminLoginRequest(
+        String account,
+        String password
+) {
+}

src/main/java/com/listywave/admin/AdminLoginResponse.java

@@ -0,0 +1,7 @@
+package com.listywave.admin;
+
+public record AdminLoginResponse(
+        String accessToken,
+        String refreshToken
+) {
+}

src/main/java/com/listywave/admin/AdminRepository.java

@@ -0,0 +1,18 @@
+package com.listywave.admin;
+
+import static com.listywave.common.exception.ErrorCode.RESOURCE_NOT_FOUND;
+
+import com.listywave.common.exception.CustomException;
+import java.util.Optional;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface AdminRepository extends JpaRepository<Admin, Long> {
+
+    default Admin getById(Long id) {
+        return findById(id).orElseThrow(() -> new CustomException(RESOURCE_NOT_FOUND));
+    }
+
+    boolean existsByIp(String ip);
+
+    Optional<Admin> findByAccount(String account);
+}

src/main/java/com/listywave/admin/AdminService.java

@@ -0,0 +1,51 @@
+package com.listywave.admin;
+
+import static com.listywave.common.exception.ErrorCode.INVALID_ACCESS;
+
+import com.listywave.auth.application.domain.JwtManager;
+import com.listywave.common.encrypt.Sha256Cipher;
+import com.listywave.common.exception.CustomException;
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class AdminService {
+
+    private final JwtManager jwtManager;
+    private final Sha256Cipher sha256Cipher;
+    private final AdminRepository adminRepository;
+
+    @Transactional(readOnly = true)
+    public boolean isValidIp(String ip) {
+        return adminRepository.existsByIp(ip);
+    }
+
+    @Transactional(readOnly = true)
+    public AdminLoginResponse login(String account, String password) {
+        Optional<Admin> optionalAdmin = adminRepository.findByAccount(account);
+        if (optionalAdmin.isPresent()) {
+            Admin admin = optionalAdmin.get();
+
+            // 암호화 적용으로 인해, 임시로 작성해둔 코드입니다.
+            // 모든 어드민이 암호를 변경하면 if 조건식만 제거합니다.
+            if (!password.equals("1234")) {
+                admin.validatePassword(sha256Cipher.encrypt(password)); // 해당 라인은 제거하지 않습니다.
+            }
+
+            String accessToken = jwtManager.createAdminAccessToken(admin.getId());
+            String refreshToken = jwtManager.createAdminRefreshToken(admin.getId());
+            return new AdminLoginResponse(accessToken, refreshToken);
+        }
+        throw new CustomException(INVALID_ACCESS);
+    }
+
+    public void update(Long adminId, String password) {
+        Admin admin = adminRepository.getById(adminId);
+        String encryptedNewPassword = sha256Cipher.encrypt(password);
+        admin.update(encryptedNewPassword);
+    }
+}

src/main/java/com/listywave/admin/AdminUpdateRequest.java

@@ -0,0 +1,6 @@
+package com.listywave.admin;
+
+public record AdminUpdateRequest(
+        String password
+) {
+}

src/main/java/com/listywave/alarm/application/domain/Alarm.java

@@ -6,11 +6,16 @@
 import static jakarta.persistence.TemporalType.TIMESTAMP;
 import static lombok.AccessLevel.PROTECTED;
 
+import com.listywave.list.application.domain.comment.Comment;
+import com.listywave.list.application.domain.list.ListEntity;
+import com.listywave.list.application.domain.reply.Reply;
+import com.listywave.notice.application.domain.Notice;
 import com.listywave.user.application.domain.User;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EntityListeners;
 import jakarta.persistence.Enumerated;
+import jakarta.persistence.ForeignKey;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
@@ -37,17 +42,27 @@ public class Alarm {
     private Long id;
 
     @ManyToOne(fetch = LAZY)
-    @JoinColumn(name = "send_user_id")
-    private User user;
+    @JoinColumn(name = "send_user_id", nullable = false)
+    private User sendUser;
 
-    @Column(nullable = false)
+    @Column(nullable = true)
     private Long receiveUserId;
 
-    @Column(nullable = true)
-    private Long listId;
+    @ManyToOne(fetch = LAZY)
+    @JoinColumn(name = "list_id", nullable = true, foreignKey = @ForeignKey(name = "alarm_list_fk"))
+    private ListEntity list;
 
-    @Column(nullable = true)
-    private Long commentId;
+    @ManyToOne(fetch = LAZY)
+    @JoinColumn(name = "comment_id", nullable = true, foreignKey = @ForeignKey(name = "alarm_comment_fk"))
+    private Comment comment;
+
+    @ManyToOne(fetch = LAZY)
+    @JoinColumn(name = "reply_id", nullable = true, foreignKey = @ForeignKey(name = "alarm_reply_fk"))
+    private Reply reply;
+
+    @ManyToOne(fetch = LAZY)
+    @JoinColumn(name = "notice_id", nullable = true, foreignKey = @ForeignKey(name = "alarm_notice_fk"))
+    private Notice notice;
 
     @Column(nullable = false)
     @Enumerated(value = STRING)
@@ -61,7 +76,7 @@ public class Alarm {
     @Column(updatable = false)
     private LocalDateTime createdDate;
 
-    public void readAlarm() {
+    public void check() {
         this.isChecked = true;
     }
 }

src/main/java/com/listywave/alarm/application/domain/AlarmCreateEvent.java

@@ -0,0 +1,104 @@
+package com.listywave.alarm.application.domain;
+
+import static com.listywave.alarm.application.domain.AlarmType.COLLECT;
+import static com.listywave.alarm.application.domain.AlarmType.COMMENT;
+import static com.listywave.alarm.application.domain.AlarmType.FOLLOW;
+import static com.listywave.alarm.application.domain.AlarmType.NOTICE;
+import static com.listywave.alarm.application.domain.AlarmType.REACTION;
+import static com.listywave.alarm.application.domain.AlarmType.REPLY;
+
+import com.listywave.list.application.domain.comment.Comment;
+import com.listywave.list.application.domain.list.ListEntity;
+import com.listywave.list.application.domain.reply.Reply;
+import com.listywave.mention.Mention;
+import com.listywave.notice.application.domain.Notice;
+import com.listywave.user.application.domain.User;
+import java.util.List;
+import lombok.Builder;
+
+@Builder
+public record AlarmCreateEvent(
+        User publisher,
+        Long listenerId,
+        ListEntity list,
+        Comment comment,
+        Reply reply,
+        List<Mention> mentions,
+        Notice notice,
+        AlarmType alarmType
+) {
+
+    public Alarm toEntity() {
+        return Alarm.builder()
+                .sendUser(publisher)
+                .receiveUserId(listenerId)
+                .list(list)
+                .comment(comment)
+                .reply(reply)
+                .type(alarmType)
+                .notice(notice)
+                .isChecked(false)
+                .build();
+    }
+
+    public static AlarmCreateEvent comment(ListEntity list, Comment comment, List<Mention> mentions) {
+        return AlarmCreateEvent.builder()
+                .publisher(comment.getUser())
+                .listenerId(list.getUser().getId())
+                .list(list)
+                .comment(comment)
+                .mentions(mentions)
+                .alarmType(COMMENT)
+                .build();
+    }
+
+    public static AlarmCreateEvent reply(Comment comment, Reply reply, List<Mention> mentions) {
+        return AlarmCreateEvent.builder()
+                .publisher(reply.getUser())
+                .listenerId(comment.getUser().getId())
+                .list(comment.getList())
+                .comment(comment)
+                .reply(reply)
+                .mentions(mentions)
+                .alarmType(REPLY)
+                .build();
+    }
+
+    public static AlarmCreateEvent follow(User publisher, User listenerUser) {
+        return AlarmCreateEvent.builder()
+                .publisher(publisher)
+                .listenerId(listenerUser.getId())
+                .alarmType(FOLLOW)
+                .build();
+    }
+
+    public static AlarmCreateEvent collect(User publisher, ListEntity list) {
+        return AlarmCreateEvent.builder()
+                .publisher(publisher)
+                .listenerId(list.getUser().getId())
+                .list(list)
+                .alarmType(COLLECT)
+                .build();
+    }
+
+    public static AlarmCreateEvent notice(User user, Notice notice) {
+        return AlarmCreateEvent.builder()
+                .publisher(user)
+                .notice(notice)
+                .alarmType(NOTICE)
+                .build();
+    }
+
+    public static AlarmCreateEvent reaction(User publisher, ListEntity list) {
+        return AlarmCreateEvent.builder()
+                .publisher(publisher)
+                .listenerId(list.getUser().getId())
+                .list(list)
+                .alarmType(REACTION)
+                .build();
+    }
+
+    public boolean isToMyself() {
+        return this.publisher.isSame(listenerId);
+    }
+}