JWT Token 기반 그룹 식별자에서 UUID기반 식별자로 변경

build.gradle

@@ -45,17 +45,27 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.security:spring-security-core'
+    implementation 'org.springframework.boot:spring-boot-starter-cache'
 
-    implementation 'com.amazonaws:aws-java-sdk-s3:1.12.638'
+    // redis
+    implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 
+    implementation 'com.amazonaws:aws-java-sdk-s3:1.12.638'
+    //jwt
     implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.5'
     runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.5'
     runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.5'
 
+    //db
+    implementation 'mysql:mysql-connector-java:8.0.30'
+
     compileOnly 'org.projectlombok:lombok'
     implementation 'mysql:mysql-connector-java:8.0.30'
     annotationProcessor 'org.projectlombok:lombok'
 
+    //test
+    testImplementation 'org.testcontainers:junit-jupiter'
+    testImplementation 'org.testcontainers:testcontainers'
     testImplementation 'com.h2database:h2'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
@@ -65,7 +75,6 @@ dependencies {
         exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
     }
     asciidoctorExt 'org.springframework.restdocs:spring-restdocs-asciidoctor'
-
     //monitoring
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'io.micrometer:micrometer-registry-prometheus'
@@ -118,6 +127,6 @@ build {
 bootJar {
     dependsOn asciidoctor
     from("${asciidoctor.outputDir}") {
-        into 'static/docs'
+        into 'src/main/resources/static/docs'
     }
 }

docker-compose.local.yml

@@ -0,0 +1,10 @@
+# 로컬 개발용 도커 컴포즈 파일
+# docker compose -f docker-compose.local.yml up -d
+# docker compose -f docker-compose.local.yml down
+services:
+  redis:
+    container_name: redis
+    image: redis:7-alpine
+    ports:
+      - "6379:6379"
+    restart: unless-stopped

docker-compose.yml

@@ -15,7 +15,18 @@ services:
       - backend
     volumes:
       - ./logs:/logs  # 로그 파일을 호스트 시스템의 ./logs 디렉토리로 매핑
-
+  redis:
+    image: redis:latest
+    container_name: redis
+    ports:
+      - "6379:6379"
+    volumes:
+      - ./redis.conf:/etc/redis/redis.conf
+      - redis-data:/data
+    command: redis-server /etc/redis/redis.conf
 networks:
   backend:
-    driver: bridge
+    driver: bridge
+
+volumes:
+  redis-data:

src/main/java/com/dnd/moddo/ModdoApplication.java

@@ -4,7 +4,7 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 
-@SpringBootApplication (exclude = SecurityAutoConfiguration.class)
+@SpringBootApplication(exclude = SecurityAutoConfiguration.class)
 public class ModdoApplication {
 
 	public static void main(String[] args) {

src/main/java/com/dnd/moddo/domain/auth/service/AuthService.java

@@ -1,40 +1,43 @@
 package com.dnd.moddo.domain.auth.service;
 
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import com.dnd.moddo.domain.user.entity.User;
 import com.dnd.moddo.domain.user.entity.type.Authority;
 import com.dnd.moddo.domain.user.repository.UserRepository;
 import com.dnd.moddo.global.jwt.dto.TokenResponse;
 import com.dnd.moddo.global.jwt.utill.JwtProvider;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDateTime;
-import java.util.UUID;
+import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
 @Service
 public class AuthService {
 
-    private final UserRepository userRepository;
-    private final JwtProvider jwtProvider;
+	private final UserRepository userRepository;
+	private final JwtProvider jwtProvider;
 
-    @Transactional
-    public TokenResponse createGuestUser() {
-        String guestEmail = "guest-" + UUID.randomUUID() + "@guest.com";
+	@Transactional
+	public TokenResponse createGuestUser() {
+		String guestEmail = "guest-" + UUID.randomUUID() + "@guest.com";
 
-        User guestUser = User.builder()
-                .email(guestEmail)
-                .name("Guest")
-                .profile(null)
-                .createdAt(LocalDateTime.now())
-                .expiredAt(LocalDateTime.now().plusMonths(1))
-                .authority(Authority.USER)
-                .isMember(false)
-                .build();
+		User guestUser = User.builder()
+			.email(guestEmail)
+			.name("Guest")
+			.profile(null)
+			.createdAt(LocalDateTime.now())
+			.expiredAt(LocalDateTime.now().plusMonths(1))
+			.authority(Authority.USER)
+			.isMember(false)
+			.build();
 
-        userRepository.save(guestUser);
+		userRepository.save(guestUser);
 
-        return jwtProvider.generateToken(guestUser.getId(), guestUser.getEmail(), guestUser.getAuthority().toString(), guestUser.getIsMember());
-    }
+		return jwtProvider.generateToken(guestUser.getId(), guestUser.getEmail(), guestUser.getAuthority().toString(),
+			guestUser.getIsMember());
+	}
 }

src/main/java/com/dnd/moddo/domain/character/controller/CharacterController.java

@@ -7,6 +7,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import com.dnd.moddo.domain.character.service.QueryCharacterService;
+import com.dnd.moddo.domain.group.service.QueryGroupService;
 import com.dnd.moddo.domain.image.dto.CharacterResponse;
 import com.dnd.moddo.global.jwt.service.JwtService;
 
@@ -19,12 +20,13 @@ public class CharacterController {
 
 	private final JwtService jwtService;
 	private final QueryCharacterService queryCharacterService;
+	private final QueryGroupService queryGroupService;
 
 	@GetMapping()
 	public ResponseEntity<CharacterResponse> getCharacter(
-		@RequestParam("groupToken") String groupToken
+		@RequestParam("groupToken") String code
 	) {
-		Long groupId = jwtService.getGroupId(groupToken);
+		Long groupId = queryGroupService.findIdByCode(code);
 
 		CharacterResponse response = queryCharacterService.findCharacterByGroupId(groupId);
 		return ResponseEntity.ok(response);

src/main/java/com/dnd/moddo/domain/expense/controller/ExpenseController.java

@@ -19,6 +19,7 @@
 import com.dnd.moddo.domain.expense.dto.response.ExpensesResponse;
 import com.dnd.moddo.domain.expense.service.CommandExpenseService;
 import com.dnd.moddo.domain.expense.service.QueryExpenseService;
+import com.dnd.moddo.domain.group.service.QueryGroupService;
 import com.dnd.moddo.global.common.annotation.VerifyManagerPermission;
 import com.dnd.moddo.global.jwt.service.JwtService;
 
@@ -34,19 +35,20 @@ public class ExpenseController {
 	private final CommandExpenseService commandExpenseService;
 	private final QueryExpenseService queryExpenseService;
 	private final JwtService jwtService;
+	private final QueryGroupService queryGroupService;
 
 	@PostMapping
 	public ResponseEntity<ExpensesResponse> saveExpenses(
-		@RequestParam("groupToken") String groupToken,
+		@RequestParam("groupToken") String code,
 		@Valid @RequestBody ExpensesRequest request) {
-		Long groupId = jwtService.getGroupId(groupToken);
+		Long groupId = queryGroupService.findIdByCode(code);
 		ExpensesResponse response = commandExpenseService.createExpenses(groupId, request);
 		return ResponseEntity.ok(response);
 	}
 
 	@GetMapping
-	public ResponseEntity<ExpensesResponse> getAllByGroupId(@RequestParam("groupToken") String groupToken) {
-		Long groupId = jwtService.getGroupId(groupToken);
+	public ResponseEntity<ExpensesResponse> getAllByGroupId(@RequestParam("groupToken") String code) {
+		Long groupId = queryGroupService.findIdByCode(code);
 		ExpensesResponse response = queryExpenseService.findAllByGroupId(groupId);
 		return ResponseEntity.ok(response);
 	}
@@ -60,8 +62,8 @@ public ResponseEntity<ExpenseResponse> getByExpenseId(@PathVariable("expenseId")
 
 	@GetMapping("/details")
 	public ResponseEntity<ExpenseDetailsResponse> getExpenseDetailsByGroupId(
-		@RequestParam("groupToken") String groupToken) {
-		Long groupId = jwtService.getGroupId(groupToken);
+		@RequestParam("groupToken") String code) {
+		Long groupId = queryGroupService.findIdByCode(code);
 		ExpenseDetailsResponse response = queryExpenseService.findAllExpenseDetailsByGroupId(groupId);
 		return ResponseEntity.ok(response);
 	}
@@ -84,11 +86,11 @@ public ResponseEntity<Void> deleteByExpenseId(@PathVariable("expenseId") Long ex
 
 	@PutMapping("/img/{expenseId}")
 	public void updateImgUrl(HttpServletRequest request,
-		@RequestParam("groupToken") String groupToken,
+		@RequestParam("groupToken") String code,
 		@PathVariable("expenseId") Long expenseId,
 		@RequestBody ExpenseImageRequest expenseImageRequest) {
 		Long userId = jwtService.getUserId(request);
-		Long groupId = jwtService.getGroupId(groupToken);
+		Long groupId = queryGroupService.findIdByCode(code);
 		commandExpenseService.updateImgUrl(userId, groupId, expenseId, expenseImageRequest);
 	}
 }

src/main/java/com/dnd/moddo/domain/group/controller/GroupController.java

@@ -43,10 +43,10 @@ public ResponseEntity<GroupSaveResponse> saveGroup(HttpServletRequest request,
 	@PutMapping("/account")
 	public ResponseEntity<GroupResponse> updateAccount(
 		HttpServletRequest request,
-		@RequestParam("groupToken") String groupToken,
+		@RequestParam("groupToken") String code,
 		@RequestBody GroupAccountRequest groupAccountRequest) {
 		Long userId = jwtService.getUserId(request);
-		Long groupId = jwtService.getGroupId(groupToken);
+		Long groupId = queryGroupService.findIdByCode(code);
 
 		GroupResponse response = commandGroupService.updateAccount(groupAccountRequest, userId, groupId);
 		return ResponseEntity.ok(response);
@@ -55,9 +55,9 @@ public ResponseEntity<GroupResponse> updateAccount(
 	@GetMapping
 	public ResponseEntity<GroupDetailResponse> getGroup(
 		HttpServletRequest request,
-		@RequestParam("groupToken") String groupToken) {
+		@RequestParam("groupToken") String code) {
 		Long userId = jwtService.getUserId(request);
-		Long groupId = jwtService.getGroupId(groupToken);
+		Long groupId = queryGroupService.findIdByCode(code);
 
 		GroupDetailResponse response = queryGroupService.findOne(groupId, userId);
 		return ResponseEntity.ok(response);
@@ -66,21 +66,30 @@ public ResponseEntity<GroupDetailResponse> getGroup(
 	@PostMapping("/password")
 	public ResponseEntity<GroupPasswordResponse> isPasswordMatch(
 		HttpServletRequest request,
-		@RequestParam("groupToken") String groupToken,
+		@RequestParam("groupToken") String code,
 		@RequestBody GroupPasswordRequest groupPasswordRequest) {
 		Long userId = jwtService.getUserId(request);
-		Long groupId = jwtService.getGroupId(groupToken);
+		Long groupId = queryGroupService.findIdByCode(code);
 
 		GroupPasswordResponse response = commandGroupService.isPasswordMatch(groupId, userId, groupPasswordRequest);
 		return ResponseEntity.ok(response);
 	}
 
 	@GetMapping("/header")
 	public ResponseEntity<GroupHeaderResponse> getHeader(
-		@RequestParam("groupToken") String groupToken) {
-		Long groupId = jwtService.getGroupId(groupToken);
-
+		@RequestParam("groupToken") String code) {
+		Long groupId = queryGroupService.findIdByCode(code);
+
+		GroupHeaderResponse response = queryGroupService.findByGroupHeader(groupId);
+		return ResponseEntity.ok(response);
+	}
+
+	@GetMapping("/header/no-cache")
+	public ResponseEntity<GroupHeaderResponse> getHeaderNoCache(
+		@RequestParam("groupToken") String code) {
+		Long groupId = queryGroupService.findIdByCodeNoCache(code);
+
 		GroupHeaderResponse response = queryGroupService.findByGroupHeader(groupId);
 		return ResponseEntity.ok(response);
 	}
-}
+}

src/main/java/com/dnd/moddo/domain/group/entity/Group.java

@@ -44,16 +44,20 @@ public class Group {
 
 	private LocalDateTime deadline;
 
+	@Column(unique = true)
+	private String code;
+
 	@Builder
 	public Group(String name, Long writer, String password, LocalDateTime createdAt,
-		String bank, String accountNumber, LocalDateTime deadline) {
+		String bank, String accountNumber, String code, LocalDateTime deadline) {
 		this.name = name;
 		this.writer = writer;
 		this.password = password;
 		this.createdAt = createdAt;
 		this.expiredAt = LocalDateTime.now().plusMonths(1);
 		this.bank = bank;
 		this.accountNumber = accountNumber;
+		this.code = code;
 		this.deadline = deadline;
 	}
 

src/main/java/com/dnd/moddo/domain/group/exception/GroupNotFoundException.java

@@ -1,10 +1,19 @@
 package com.dnd.moddo.domain.group.exception;
 
-import com.dnd.moddo.global.exception.ModdoException;
 import org.springframework.http.HttpStatus;
 
+import com.dnd.moddo.global.exception.ModdoException;
+
 public class GroupNotFoundException extends ModdoException {
-    public GroupNotFoundException(Long groupId){
-        super(HttpStatus.NOT_FOUND, "아이디가 " + groupId + "인 모임을 찾을 수 없습니다.");
-    };
+	public GroupNotFoundException(Long groupId) {
+		super(HttpStatus.NOT_FOUND, "아이디가 " + groupId + "인 모임을 찾을 수 없습니다.");
+	}
+
+	;
+
+	public GroupNotFoundException(String code) {
+		super(HttpStatus.NOT_FOUND, "그룹 코드가 " + code + "인 모임을 찾을 수 없습니다.");
+	}
+
+	;
 }

src/main/java/com/dnd/moddo/domain/group/repository/GroupRepository.java

@@ -1,11 +1,26 @@
 package com.dnd.moddo.domain.group.repository;
 
+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 com.dnd.moddo.domain.group.entity.Group;
 import com.dnd.moddo.domain.group.exception.GroupNotFoundException;
-import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface GroupRepository extends JpaRepository<Group, Long> {
-    default Group getById(Long groupId) {
-        return findById(groupId).orElseThrow(() -> new GroupNotFoundException(groupId));
-    }
+	default Group getById(Long groupId) {
+		return findById(groupId).orElseThrow(() -> new GroupNotFoundException(groupId));
+	}
+
+	boolean existsByCode(String code);
+
+	@Query("SELECT g.id FROM Group g WHERE g.code = :code")
+	Optional<Long> findIdByCode(@Param("code") String code);
+
+	default Long getIdByCode(String code) {
+		return findIdByCode(code).orElseThrow(() -> new GroupNotFoundException(code));
+	}
+
 }