Merge pull request #26 from ASSU-org/feat/#21-popular-partenrship

[Feat/#21] 사용자 제휴내역 조회 및 인기 통계

Author: eeeeeaaan

build.gradle

@@ -85,6 +85,8 @@ dependencies {
 	// h2 db (test)
 	runtimeOnly 'com.h2database:h2'
 
+	// JSON 처리
+	implementation 'com.fasterxml.jackson.core:jackson-databind'
     implementation group: 'org.javassist', name: 'javassist', version: '3.15.0-GA'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
 

src/main/java/com/assu/server/domain/admin/entity/Admin.java

@@ -1,7 +1,12 @@
 package com.assu.server.domain.admin.entity;
 
+
+import com.assu.server.domain.user.entity.enums.Major;
 import com.assu.server.domain.member.entity.Member;
+
 import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.MapsId;
 import jakarta.persistence.OneToOne;
@@ -38,4 +43,11 @@ public class Admin {
     private Boolean isSignVerified;
 
     private LocalDateTime signVerifiedAt;
+
+    @Enumerated(EnumType.STRING)
+    private Major major;
+
+    public void setMember(Member member) {
+        this.member = member;
+    }
 }

src/main/java/com/assu/server/domain/admin/repository/AdminRepository.java

@@ -1,13 +1,30 @@
 package com.assu.server.domain.admin.repository;
 
-import com.assu.server.domain.admin.entity.Admin;
+import java.util.List;
+import java.util.Optional;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
-
 import java.util.List;
+import com.assu.server.domain.admin.entity.Admin;
+import com.assu.server.domain.user.entity.enums.Department;
+import com.assu.server.domain.user.entity.enums.Major;
+import com.assu.server.domain.user.entity.enums.University;
 
 public interface AdminRepository extends JpaRepository<Admin, Long> {
+
+	// 여기 예원이 머지하고 수정
+	@Query("SELECT a FROM Admin a WHERE " +
+		"a.name LIKE %:university% OR " +
+		"a.name LIKE %:department% OR " +
+		"a.major = :major")
+	List<Admin> findMatchingAdmins(@Param("university") String university,
+		@Param("department") String department,
+		@Param("major") Major major);
+
+	Optional<Admin> findByName(String name);
+
     // 후보 수 카운트: 해당 partner와 ACTIVE 제휴가 없는 admin 수
     @Query(value = """
         SELECT COUNT(*)
@@ -34,4 +51,5 @@ SELECT COUNT(*)
     List<Admin> findPartnerWithOffset(@Param("partnerId") Long partnerId,
                                                          @Param("offset") int offset,
                                                          @Param("limit") int limit);
+
 }

src/main/java/com/assu/server/domain/admin/service/AdminService.java

@@ -1,8 +1,17 @@
 package com.assu.server.domain.admin.service;
-
 import com.assu.server.domain.admin.dto.AdminResponseDTO;
 
+import java.util.List;
+
+import com.assu.server.domain.admin.entity.Admin;
+import com.assu.server.domain.user.entity.enums.Department;
+import com.assu.server.domain.user.entity.enums.Major;
+import com.assu.server.domain.user.entity.enums.University;
+
+// PaperQueryServiceImpl 이 AdminService 참조 중 -> 순환참조 문제 발생하지 않도록 주의
 public interface AdminService {
+	List<Admin> findMatchingAdmins(String university, String department, Major major);
 
     AdminResponseDTO.RandomPartnerResponseDTO suggestRandomPartner(Long adminId);
+
 }

src/main/java/com/assu/server/domain/admin/service/AdminServiceImpl.java

@@ -1,25 +1,38 @@
 package com.assu.server.domain.admin.service;
 
+
+import java.util.List;
+import org.springframework.stereotype.Service;
 import com.assu.server.domain.admin.dto.AdminResponseDTO;
 import com.assu.server.domain.admin.entity.Admin;
 import com.assu.server.domain.admin.repository.AdminRepository;
+import com.assu.server.domain.user.entity.enums.Major;
+import jakarta.transaction.Transactional;
+import lombok.RequiredArgsConstructor;
 import com.assu.server.domain.partner.entity.Partner;
 import com.assu.server.domain.partner.repository.PartnerRepository;
 import com.assu.server.global.apiPayload.code.status.ErrorStatus;
 import com.assu.server.global.exception.DatabaseException;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-
 import java.util.concurrent.ThreadLocalRandom;
 
+
 @Service
 @RequiredArgsConstructor
 public class AdminServiceImpl implements AdminService {
 
     private final AdminRepository adminRepository;
     private final PartnerRepository partnerRepository;
+	@Override
+	@Transactional
+	public List<Admin> findMatchingAdmins(String university, String department, Major major){
+
 
+		List<Admin> adminList = adminRepository.findMatchingAdmins(university, department,major);
+
+		return adminList;
+	}
     @Override
+	@Transactional
     public AdminResponseDTO.RandomPartnerResponseDTO suggestRandomPartner(Long adminId) {
 
         Admin admin = adminRepository.findById(adminId)
@@ -44,4 +57,5 @@ public AdminResponseDTO.RandomPartnerResponseDTO suggestRandomPartner(Long admin
                 .partnerDetailAddress(picked.getDetailAddress())
                 .build();
     }
+
 }

src/main/java/com/assu/server/domain/auth/entity/SSUAuth.java

@@ -11,7 +11,7 @@
 @Table(
         name = "ssu_auth",
         indexes = {
-                @Index(name = "ux_ssu_auth_student_id", columnList = "student_id", unique = true)
+                @Index(name = "ux_ssu_auth_student_id", columnList = "student_number", unique = true)
         }
 )
 @Getter

src/main/java/com/assu/server/domain/certification/SessionTimeoutManager.java

@@ -0,0 +1,47 @@
+package com.assu.server.domain.certification;
+
+import java.time.Duration;
+import java.util.Optional;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.assu.server.domain.certification.component.CertificationSessionManager;
+import com.assu.server.domain.certification.entity.AssociateCertification;
+import com.assu.server.domain.certification.entity.enums.SessionStatus;
+import com.assu.server.domain.certification.repository.AssociateCertificationRepository;
+
+@Component
+public class SessionTimeoutManager {
+
+	private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
+
+	@Autowired
+	private AssociateCertificationRepository certificationRepository;
+
+	@Autowired
+	private CertificationSessionManager sessionManager;
+
+	public void scheduleTimeout(Long sessionId, Duration timeout) {
+		scheduler.schedule(() -> {
+			closeSession(sessionId);
+		}, timeout.toMillis(), TimeUnit.MILLISECONDS);
+	}
+
+	private void closeSession(Long sessionId) {
+		Optional<AssociateCertification> certOpt = certificationRepository.findById(sessionId);
+		certOpt.ifPresent(cert -> {
+			if (cert.getStatus() == SessionStatus.OPENED) {
+				cert.setStatus(SessionStatus.EXPIRED);
+				certificationRepository.save(cert);
+			}
+		});
+		// 이러면 인증 전에 만료되는 것은 EXPIRED로, 시간안에 인증 된 세션은 COMPLETED로 남음
+
+		// 메모리에서도 세션 제거
+		sessionManager.removeSession(sessionId);
+	}
+}

src/main/java/com/assu/server/domain/certification/component/CertificationSessionManager.java

@@ -0,0 +1,36 @@
+package com.assu.server.domain.certification.component;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.springframework.stereotype.Component;
+
+@Component
+public class CertificationSessionManager {
+	private final Map<Long, Set<Long>> sessionUserMap = new ConcurrentHashMap<>();
+
+	public void openSession(Long sessionId) {
+		sessionUserMap.put(sessionId, ConcurrentHashMap.newKeySet());
+	}
+
+	public void addUserToSession(Long sessionId, Long userId) {
+		sessionUserMap.getOrDefault(sessionId, ConcurrentHashMap.newKeySet()).add(userId);
+	}
+
+	public int getCurrentUserCount(Long sessionId) {
+		return sessionUserMap.getOrDefault(sessionId, Set.of()).size();
+	}
+
+	public boolean hasUser(Long sessionId, Long userId) {
+		return sessionUserMap.getOrDefault(sessionId, Set.of()).contains(userId);
+	}
+	public List<Long> snapshotUserIds(Long sessionId) {
+		return List.copyOf(sessionUserMap.getOrDefault(sessionId, Set.of()));
+	}
+
+	public void removeSession(Long sessionId) {
+		sessionUserMap.remove(sessionId);
+	}
+}

src/main/java/com/assu/server/domain/certification/config/CertifyWebSocketConfig.java

@@ -0,0 +1,34 @@
+package com.assu.server.domain.certification.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.messaging.simp.config.ChannelRegistration;
+import org.springframework.messaging.simp.config.MessageBrokerRegistry;
+import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
+import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
+import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
+
+import lombok.RequiredArgsConstructor;
+
+@EnableWebSocketMessageBroker
+@Configuration
+@RequiredArgsConstructor
+public class CertifyWebSocketConfig implements WebSocketMessageBrokerConfigurer {
+
+	private final StompAuthChannelInterceptor stompAuthChannelInterceptor;
+	@Override
+	public void configureMessageBroker(MessageBrokerRegistry config) {
+		config.enableSimpleBroker("/certification/progress"); // 인증현황을 받아보기 위한 구독 주소
+		config.setApplicationDestinationPrefixes("/certification"); // 클라이언트가 인증 요청을 보내는 주소
+	}
+
+	@Override
+	public void registerStompEndpoints(StompEndpointRegistry registry) {
+		registry.addEndpoint("/ws")           // 클라이언트 WebSocket 연결 주소
+			.setAllowedOriginPatterns("*").withSockJS(); // CORS 허용
+	}
+
+	@Override
+	public void configureClientInboundChannel(ChannelRegistration registration) {
+		registration.interceptors(stompAuthChannelInterceptor);
+	}
+}

src/main/java/com/assu/server/domain/certification/config/StompAuthChannelInterceptor.java

@@ -0,0 +1,37 @@
+package com.assu.server.domain.certification.config;
+
+import com.assu.server.domain.auth.security.jwt.JwtUtil;
+import lombok.RequiredArgsConstructor;
+import org.springframework.messaging.*;
+import org.springframework.messaging.simp.stomp.*;
+import org.springframework.messaging.support.ChannelInterceptor;
+import org.springframework.security.core.Authentication;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class StompAuthChannelInterceptor implements ChannelInterceptor {
+
+	private final JwtUtil jwtUtil;
+
+	@Override
+	public Message<?> preSend(Message<?> message, MessageChannel channel) {
+		StompHeaderAccessor accessor = StompHeaderAccessor.wrap(message);
+
+		if (StompCommand.CONNECT.equals(accessor.getCommand())) {
+			// 프론트에서 connect 시 Authorization 헤더 넣어야 함
+			String authHeader = accessor.getFirstNativeHeader("Authorization");
+			if (authHeader != null && authHeader.startsWith("Bearer ")) {
+				String token = jwtUtil.getTokenFromHeader(authHeader);
+
+				// JwtUtil 이용해서 Authentication 복원
+				Authentication authentication = jwtUtil.getAuthentication(token);
+
+				// WebSocket 세션에 Authentication(UserPrincipal) 저장
+				accessor.setUser(authentication);
+			}
+		}
+
+		return message;
+	}
+}