Merge branch 'dev'

Author: seoyeonson

src/main/java/cmf/commitField/CommitFieldApplication.java

@@ -8,7 +8,8 @@
 @SpringBootApplication
 @EnableJpaAuditing
 @EnableScheduling
-public class CommitFieldApplication {
+public class
+CommitFieldApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(CommitFieldApplication.class, args);
 	}

src/main/java/cmf/commitField/domain/commit/scheduler/CommitScheduler.java

@@ -7,6 +7,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
@@ -23,9 +24,32 @@ public class CommitScheduler {
     private final UserRepository userRepository;
     private final StringRedisTemplate redisTemplate;
     private final AtomicInteger counter = new AtomicInteger(0);
+    private final SimpMessagingTemplate messagingTemplate;
 
     private final ApplicationEventPublisher eventPublisher;
 
+    // TODO: 확장시 추가
+
+//    @Scheduled(fixedRate = 60000) // 1분마다 실행
+//    public void updateMatchCommitCounts() {
+//        Map<Object, Object> entries = redisTemplate.opsForHash().entries("active_matches");
+//
+//        Map<String, MatchSession> activeMatches = new HashMap<>();
+//        for (Map.Entry<Object, Object> entry : entries.entrySet()) {
+//            if (entry.getKey() instanceof String && entry.getValue() instanceof MatchSession) {
+//                activeMatches.put((String) entry.getKey(), (MatchSession) entry.getValue());
+//            }
+//        }
+//
+//        for (MatchSession match : activeMatches.values()) {
+//            long player1Commits = Long.parseLong(redisTemplate.opsForValue().get("commit_active:"+match.getPlayer1()));
+//            long player2Commits = Long.parseLong(redisTemplate.opsForValue().get("commit_active:"+match.getPlayer2()));
+//
+//            redisTemplate.opsForHash().put("active_matches", match.getMatchId(), match);
+//
+//            messagingTemplate.convertAndSend("/topic/match/" + match.getMatchId(), match);
+//        }
+//    }
 
     @Scheduled(fixedRate = 60000) // 1분마다 실행
     public void updateUserCommits() {

src/main/java/cmf/commitField/domain/commit/scheduler/CommitUpdateService.java

@@ -3,6 +3,7 @@
 import cmf.commitField.domain.commit.totalCommit.service.TotalCommitService;
 import cmf.commitField.domain.noti.noti.service.NotiService;
 import cmf.commitField.domain.user.dto.UserInfoDto;
+import cmf.commitField.domain.user.entity.Tier;
 import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.domain.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
@@ -23,7 +24,7 @@ public UserInfoDto updateUserTier(String username){
         User user = userRepository.findByUsername(username).get();
         long seasonCommitCount;
         seasonCommitCount = totalCommitService.getSeasonCommits(user.getUsername(), LocalDateTime.of(2025,03,01,0,0), LocalDateTime.of(2025,05,31,23,59)).getTotalCommitContributions();
-        user.setTier(User.Tier.getLevelByExp((int)seasonCommitCount));
+        user.setTier(Tier.getLevelByExp((int)seasonCommitCount));
         System.out.println(username+"유저 레벨 업! 현재 티어: "+user.getTier());
         userRepository.save(user);
 

src/main/java/cmf/commitField/domain/commit/totalCommit/config/WebConfig.java

@@ -8,7 +8,7 @@ public class WebConfig implements WebMvcConfigurer {
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")
-                .allowedOrigins("http://localhost:8090") // 프론트엔드 도메인
+                .allowedOrigins("http://localhost:5173") // 프론트엔드 도메인
                 .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
                 .allowedHeaders("*")
                 .allowCredentials(true);

src/main/java/cmf/commitField/domain/pet/entity/PetGrow.java

@@ -4,9 +4,10 @@
 
 @Getter
 public enum PetGrow {
+    //FIXME: 테스트를 위한 수정, 차후 15/30으로 변경 필요
     EGG(0),
-    HATCH(150),
-    GROWN(300);
+    HATCH(20),
+    GROWN(40);
 
     private final int requiredExp;
 

src/main/java/cmf/commitField/domain/user/controller/MatchController.java

@@ -0,0 +1,22 @@
+package cmf.commitField.domain.user.controller;
+
+import cmf.commitField.domain.user.service.MatchService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/match")
+public class MatchController {
+    private final MatchService matchService;
+
+    @PostMapping("/request")
+    public ResponseEntity<String> requestMatch(@RequestParam String userId, @RequestParam int duration) {
+        matchService.enqueueUser(userId, duration);
+        return ResponseEntity.ok("매칭 대기열에 추가됨");
+    }
+}

src/main/java/cmf/commitField/domain/user/controller/UserController.java

@@ -1,7 +1,9 @@
 package cmf.commitField.domain.user.controller;
 
 import cmf.commitField.domain.commit.totalCommit.service.TotalCommitService;
+import cmf.commitField.domain.user.dto.UserChatInfoDto;
 import cmf.commitField.domain.user.dto.UserInfoDto;
+import cmf.commitField.domain.user.dto.UserRegacyDto;
 import cmf.commitField.domain.user.entity.CustomOAuth2User;
 import cmf.commitField.domain.user.service.UserService;
 import lombok.RequiredArgsConstructor;
@@ -11,14 +13,27 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/api/user")
 @RequiredArgsConstructor
 public class UserController {
     private final UserService userService;
     private final TotalCommitService totalCommitService;
 
-    @GetMapping("info")
+    @GetMapping("/chatinfo")
+    public ResponseEntity<UserChatInfoDto> getUserChatInfo(@AuthenticationPrincipal CustomOAuth2User oAuth2User){
+        String username = oAuth2User.getName();
+
+        //유저 정보의 조회
+        //이 이벤트가 일어나면 유저의 정보를 확인하고, 조회한 유저를 active 상태로 만든다.
+        UserChatInfoDto userChatInfoDto = userService.showUserChatInfo(username);
+
+        return ResponseEntity.ok(userChatInfoDto);
+    }
+
+    @GetMapping("/info")
     public ResponseEntity<UserInfoDto> getUserInfo(@AuthenticationPrincipal CustomOAuth2User oAuth2User){
         String username = oAuth2User.getName();
 
@@ -28,4 +43,11 @@ public ResponseEntity<UserInfoDto> getUserInfo(@AuthenticationPrincipal CustomOA
 
         return ResponseEntity.ok(userInfoDto);
     }
+
+    @GetMapping("/tierinfo")
+    public ResponseEntity<List<UserRegacyDto>> getUserTierInfo(@AuthenticationPrincipal CustomOAuth2User oAuth2User) {
+        String username = oAuth2User.getName();
+        List<UserRegacyDto> tierList = userService.showUserRegacy(username);
+        return ResponseEntity.ok(tierList);
+    }
 }

src/main/java/cmf/commitField/domain/user/dto/UserChatInfoDto.java

@@ -0,0 +1,13 @@
+package cmf.commitField.domain.user.dto;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@Getter
+public class UserChatInfoDto {
+    private long id;
+    private String username;
+    private String nickname;
+    private String email;
+}

src/main/java/cmf/commitField/domain/user/dto/UserInfoDto.java

@@ -10,6 +10,7 @@
 public class UserInfoDto {
 
     private String username;
+    private String nickname;
     private String email;
     private String avatarUrl;
     private LocalDateTime createdAt;

src/main/java/cmf/commitField/domain/user/dto/UserRegacyDto.java

@@ -0,0 +1,13 @@
+package cmf.commitField.domain.user.dto;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@Getter
+public class UserRegacyDto {
+    private long user_id;
+    private String year;
+    private String season;
+    private String tier;
+}

src/main/java/cmf/commitField/domain/user/entity/MatchSession.java

@@ -0,0 +1,30 @@
+package cmf.commitField.domain.user.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class MatchSession {
+    private String matchId;
+    private String player1;
+    private String player2;
+    private int matchDuration; // 1/3/5시간
+    private long startTime;
+    private int player1Commits;
+    private int player2Commits;
+
+    public MatchSession(String matchId, String player1, String player2, int matchDuration) {
+        this.matchId = matchId;
+        this.player1 = player1;
+        this.player2 = player2;
+        this.matchDuration = matchDuration;
+        this.startTime = System.currentTimeMillis();
+        this.player1Commits = 0;
+        this.player2Commits = 0;
+    }
+
+    public boolean isTimeUp() {
+        return System.currentTimeMillis() - startTime >= matchDuration * 3600000;
+    }
+}

src/main/java/cmf/commitField/domain/user/entity/Tier.java

@@ -0,0 +1,31 @@
+package cmf.commitField.domain.user.entity;
+
+public enum Tier {
+    NONE(0), // 미획득(하나도 Commit하지 않음)
+    SEED(1),      // 씨앗
+    SPROUT(95),    // 새싹
+    FLOWER(189),    // 꽃
+    FRUIT(283),     // 열매
+    TREE(377);       // 나무
+
+    private final long requiredExp;
+
+    Tier(long requiredExp) {
+        this.requiredExp = requiredExp;
+    }
+
+    public long getRequiredExp() {
+        return requiredExp;
+    }
+
+    // 현재 경험치에 맞는 레벨 찾기
+    public static Tier getLevelByExp(long exp) {
+        Tier currentLevel = SEED;
+        for (Tier level : values()) {
+            if (exp >= level.getRequiredExp()) {
+                currentLevel = level;
+            }
+        }
+        return currentLevel;
+    }
+}

src/main/java/cmf/commitField/domain/user/entity/TierRegacy.java

@@ -0,0 +1,34 @@
+package cmf.commitField.domain.user.entity;
+
+import cmf.commitField.global.jpa.BaseEntity;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
+
+@Entity
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@SuperBuilder
+@Table(name = "tierRegacy")
+public class TierRegacy extends BaseEntity {
+    private String year;
+    private String season;
+
+    @Enumerated(EnumType.STRING)  // DB에 저장될 때 String 형태로 저장됨
+    private Tier tier;
+
+    public TierRegacy(User user){
+        this.user=user;
+        this.year="2025";
+    }
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false)
+    private User user;
+
+}

src/main/java/cmf/commitField/domain/user/entity/User.java

@@ -44,36 +44,6 @@ public enum Role {
     @Enumerated(EnumType.STRING)  // DB에 저장될 때 String 형태로 저장됨
     private Tier tier;
 
-    public enum Tier {
-        SEED(0),      // 씨앗
-        SPROUT(95),    // 새싹
-        FLOWER(189),    // 꽃
-        FRUIT(283),     // 열매
-        TREE(377);       // 나무
-
-        private final long requiredExp;
-
-        Tier(long requiredExp) {
-            this.requiredExp = requiredExp;
-        }
-
-        public long getRequiredExp() {
-            return requiredExp;
-        }
-
-        // 현재 경험치에 맞는 레벨 찾기
-        public static Tier getLevelByExp(long exp) {
-            Tier currentLevel = SEED;
-            for (Tier level : values()) {
-                if (exp >= level.getRequiredExp()) {
-                    currentLevel = level;
-                }
-            }
-            return currentLevel;
-        }
-    }
-
-
     @OneToMany(mappedBy = "user", fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
     @JsonIgnore
     private List<ChatRoom> chatRooms = new ArrayList<>();
@@ -86,10 +56,14 @@ public static Tier getLevelByExp(long exp) {
     @JsonIgnore
     private List<ChatMsg> chatMsgs = new ArrayList<>();
 
-    @OneToMany(mappedBy = "user", fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    @OneToMany(mappedBy = "user", fetch = FetchType.LAZY, cascade = CascadeType.PERSIST, orphanRemoval = true)
     @JsonIgnore
     private List<Pet> pets = new ArrayList<>();
 
+    @OneToMany(mappedBy = "user", fetch = FetchType.LAZY, cascade = CascadeType.PERSIST, orphanRemoval = true)
+    @JsonIgnore
+    private List<TierRegacy> tiers = new ArrayList<>();
+
     @OneToMany(mappedBy = "user", fetch = FetchType.LAZY)
     @JsonIgnore
     private List<Heart> hearts;

src/main/java/cmf/commitField/domain/user/repository/TierRegacyRepository.java

@@ -0,0 +1,16 @@
+package cmf.commitField.domain.user.repository;
+
+import cmf.commitField.domain.user.entity.TierRegacy;
+import cmf.commitField.domain.user.entity.User;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Optional;
+
+@Repository
+public interface TierRegacyRepository extends JpaRepository<TierRegacy, Long>{
+    Optional<TierRegacy> findById(Long id);
+    List<TierRegacy> findByUserUsername(String username);
+    List<TierRegacy> findByUser(User user);
+}