Merge pull request #19 from classpick-alpha/feature/group

[v0.2.0] 그룹 생성 및 조회

Author: snacktime81

src/main/java/com/github/classpick/global/security/jwt/TokenAuthenticationFilter.java

@@ -15,6 +15,8 @@
 
 import java.io.IOException;
 
+import static org.springframework.security.core.context.SecurityContextHolder.*;
+
 @RequiredArgsConstructor
 public class TokenAuthenticationFilter extends OncePerRequestFilter {
 
@@ -33,7 +35,7 @@ public void doFilterInternal(
         try {
             if (accessToken != null && tokenProvider.validateToken(accessToken)) {
                 Authentication authentication = tokenProvider.getAuthentication(accessToken);
-                SecurityContextHolder.getContext().setAuthentication(authentication);
+                getContext().setAuthentication(authentication);
             }
         } catch (JwtAuthenticationException e) {
             handleException(response, e);

src/main/java/com/github/classpick/global/security/oauth/OAuth2AuthenticationSuccessHandler.java

@@ -2,6 +2,8 @@
 
 import com.github.classpick.global.property.OauthProperty;
 import com.github.classpick.global.security.jwt.TokenProvider;
+import com.github.classpick.user.repository.GroupEntity;
+import com.github.classpick.user.repository.GroupRepository;
 import com.github.classpick.user.repository.Role;
 import com.github.classpick.user.repository.UserEntity;
 import com.github.classpick.user.repository.UserRepository;
@@ -13,6 +15,7 @@
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
+import java.util.Optional;
 
 @Component
 @RequiredArgsConstructor
@@ -21,6 +24,7 @@ public class OAuth2AuthenticationSuccessHandler extends SimpleUrlAuthenticationS
     private static final String KOOKMIN_EMAIL_REGEX = ".*@kookmin\\.ac\\.kr$";
     private final OauthProperty oauthProperty;
     private final UserRepository userRepository;
+    private final GroupRepository groupRepository;
     private final TokenProvider tokenProvider;
 
     @Override
@@ -44,10 +48,27 @@ public void onAuthenticationSuccess(
         }
 
         UserEntity user = userRepository.findByEmail(email)
-                .orElseGet(() -> userRepository.save(UserEntity.builder()
-                        .role(Role.USER)
-                        .email(oauth2User.getEmail())
-                        .build()));
+                .orElseGet(
+                        () -> {
+
+                            String emailDomain = email.split("@")[1];
+                            Optional<GroupEntity> savedGroupOptional = groupRepository.findByDomain(emailDomain);
+                            GroupEntity group;
+                            if(savedGroupOptional.isEmpty()){
+                                GroupEntity newGroupEntity = GroupEntity.ofDB(emailDomain);
+                                newGroupEntity = groupRepository.save(newGroupEntity);
+                                group = newGroupEntity;
+                            } else{
+                                group = savedGroupOptional.get();
+                            }
+
+                            return userRepository.save(UserEntity.builder()
+                                    .role(Role.USER)
+                                    .email(email)
+                                    .group(group)
+                                    .build());
+                        }
+                );
 
         String accessToken = tokenProvider.generateToken(user);
 

src/main/java/com/github/classpick/room/controller/RoomController.java

@@ -1,6 +1,7 @@
 package com.github.classpick.room.controller;
 
 import com.github.classpick.global.dto.Response;
+import com.github.classpick.global.user.UserGetter;
 import com.github.classpick.room.controller.dto.request.RoomFilterRequest;
 import com.github.classpick.room.controller.dto.response.RoomListResponse;
 import com.github.classpick.room.controller.dto.response.RoomTimeTableResponse;
@@ -23,14 +24,15 @@
 public class RoomController {
 
     private final RoomService roomService;
+    private final UserGetter userGetter;
 
     @Operation(summary = "강의실 목록 조회")
     @GetMapping("/v0.0/rooms")
     public Response<RoomListResponse> getRooms(
             @ModelAttribute @Valid RoomFilterRequest request
     ) {
-
-        return Response.ok(roomService.getRoomList(request));
+        Long userId = userGetter.getUser().getUserId();
+        return Response.ok(roomService.getRoomList(request, userId));
     }
 
     @Operation(summary = "강의실 타임테이블 조회")

src/main/java/com/github/classpick/room/repository/RoomEntity.java

@@ -1,11 +1,15 @@
 package com.github.classpick.room.repository;
 
 import com.github.classpick.global.entity.BaseTimeEntity;
+import com.github.classpick.user.repository.GroupEntity;
 import jakarta.annotation.Nullable;
 import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 import jakarta.validation.constraints.NotNull;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -40,4 +44,9 @@ public class RoomEntity extends BaseTimeEntity {
 
     @Nullable
     private String image;
+
+    @NotNull
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "group_id")
+    private GroupEntity group;
 }

src/main/java/com/github/classpick/room/repository/RoomRepository.java

@@ -14,7 +14,7 @@ public interface RoomRepository extends JpaRepository<RoomEntity, Long> {
     @Query("""
             select r
             from RoomEntity r
-            where r.placeName = coalesce(:placeName, r.placeName)
+            where r.group.groupId = :groupId and r.placeName = coalesce(:placeName, r.placeName)
               and (
                   :capacity is null
                   or (r.capacity is not null and r.capacity >= :capacity)
@@ -35,6 +35,7 @@ and re.status in ('APPROVED','REQUESTED')
               )
             """)
     List<RoomEntity> findAllWithFilter(
+            Long groupId,
             String placeName,
             Integer capacity,
             LocalDate date,

src/main/java/com/github/classpick/room/service/RoomService.java

@@ -14,7 +14,14 @@
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
+
+import com.github.classpick.user.exception.UserException;
+import com.github.classpick.user.exception.UserExceptionCode;
+import com.github.classpick.user.repository.GroupRepository;
+import com.github.classpick.user.repository.UserEntity;
+import com.github.classpick.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -25,11 +32,17 @@ public class RoomService {
 
     private final RoomRepository roomRepository;
     private final ReservationRepository reservationRepository;
+    private final UserRepository userRepository;
 
     @Transactional(readOnly = true)
-    public RoomListResponse getRoomList(RoomFilterRequest dto) {
+    public RoomListResponse getRoomList(RoomFilterRequest dto, Long userId) {
+
+        UserEntity savedUserEntity = userRepository.findById(userId)
+                .orElseThrow(() -> new UserException(UserExceptionCode.USER_NOT_FOUND));
+        Long groupId = savedUserEntity.getGroup().getGroupId();
 
         List<RoomResponse> rooms = roomRepository.findAllWithFilter(
+                groupId,
                         dto.getPlaceName(),
                         dto.getCapacity(),
                         dto.getDate(),

src/main/java/com/github/classpick/user/repository/GroupEntity.java

@@ -0,0 +1,31 @@
+package com.github.classpick.user.repository;
+
+import com.github.classpick.global.entity.BaseTimeEntity;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.validation.constraints.NotNull;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Builder(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Getter
+@Entity
+public class GroupEntity extends BaseTimeEntity {
+    @Id @GeneratedValue(strategy = jakarta.persistence.GenerationType.IDENTITY)
+    private Long groupId;
+
+    @NotNull
+    private String domain;
+
+    public static GroupEntity ofDB(String domain) {
+        return GroupEntity.builder()
+                .domain(domain)
+                .build();
+    }
+}

src/main/java/com/github/classpick/user/repository/GroupRepository.java

@@ -0,0 +1,9 @@
+package com.github.classpick.user.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+
+public interface GroupRepository extends JpaRepository<GroupEntity, Long> {
+    Optional<GroupEntity> findByDomain(String domain);
+}

src/main/java/com/github/classpick/user/repository/UserEntity.java

@@ -5,9 +5,13 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
 import jakarta.validation.constraints.NotNull;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -44,6 +48,10 @@ public class UserEntity extends BaseTimeEntity {
     @Nullable
     private String phoneNumber;
 
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "group_id")
+    private GroupEntity group;
+
     @Override
     public boolean equals(Object o) {