Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature : vote, room 의존성 분리 및 vote repository 추가 #85

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ repositories {
}

dependencies {
implementation 'org.springframework.boot:spring-boot-starter-data-redis'
testImplementation 'org.testcontainers:testcontainers'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TestContainer.. 이제 내 컴퓨터에서 테스트를 돌릴 때 마다 1분씩 걸리겠군요 ㅠ

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

저도... 그게 걱정..... 테스트 너무 오래걸리는거 아닌가 싶기도 해서요

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

testcontainers는 springboot 자체에서 기본적으로 h2는 지원하는데 redis는 없어서 redis로 테스트 돌리기위해서 필요한건가?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

예스 Redis를 돌리기위해 testContainers로 Redis 도커 띄워서 사용하고 있음


implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation 'org.springframework.boot:spring-boot-starter-web'
compileOnly 'org.projectlombok:lombok'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package mafia.mafiatogether.chat.service;
package mafia.mafiatogether.chat.application;

import java.util.List;
import lombok.RequiredArgsConstructor;
import mafia.mafiatogether.chat.domain.Chat;
import mafia.mafiatogether.chat.domain.Message;
import mafia.mafiatogether.job.domain.Player;
import mafia.mafiatogether.room.domain.Room;
import mafia.mafiatogether.room.repository.RoomManager;
import mafia.mafiatogether.chat.dto.request.ChatRequest;
import mafia.mafiatogether.chat.dto.response.ChatResponse;
import mafia.mafiatogether.room.domain.RoomManager;
import mafia.mafiatogether.chat.application.dto.request.ChatRequest;
import mafia.mafiatogether.chat.application.dto.response.ChatResponse;
import org.springframework.stereotype.Service;

@Service
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.chat.dto.request;
package mafia.mafiatogether.chat.application.dto.request;

import jakarta.validation.constraints.NotNull;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.chat.dto.response;
package mafia.mafiatogether.chat.application.dto.response;

import java.sql.Timestamp;
import mafia.mafiatogether.chat.domain.Message;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package mafia.mafiatogether.chat.presentation;
package mafia.mafiatogether.chat.ui;

import jakarta.validation.Valid;
import java.util.List;
import lombok.RequiredArgsConstructor;
import mafia.mafiatogether.config.PlayerInfo;
import mafia.mafiatogether.chat.service.ChatService;
import mafia.mafiatogether.chat.dto.request.ChatRequest;
import mafia.mafiatogether.chat.dto.response.ChatResponse;
import mafia.mafiatogether.job.dto.PlayerInfoDto;
import mafia.mafiatogether.global.config.PlayerInfo;
import mafia.mafiatogether.chat.application.ChatService;
import mafia.mafiatogether.chat.application.dto.request.ChatRequest;
import mafia.mafiatogether.chat.application.dto.response.ChatResponse;
import mafia.mafiatogether.job.application.dto.PlayerInfoDto;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package mafia.mafiatogether.config;
package mafia.mafiatogether.global.config;

import jakarta.servlet.http.HttpServletRequest;
import java.util.Base64;
import mafia.mafiatogether.config.exception.AuthException;
import mafia.mafiatogether.config.exception.ExceptionCode;
import mafia.mafiatogether.job.dto.PlayerInfoDto;
import mafia.mafiatogether.global.config.exception.AuthException;
import mafia.mafiatogether.global.config.exception.ExceptionCode;
import mafia.mafiatogether.job.application.dto.PlayerInfoDto;
import org.springframework.core.MethodParameter;
import org.springframework.web.bind.support.WebDataBinderFactory;
import org.springframework.web.context.request.NativeWebRequest;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.config;
package mafia.mafiatogether.global.config;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand Down
24 changes: 24 additions & 0 deletions src/main/java/mafia/mafiatogether/global/config/RedisConfig.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package mafia.mafiatogether.global.config;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;

@Configuration
@EnableRedisRepositories
public class RedisConfig {

@Value("${spring.redis.host}")
private String host;

@Value(("${spring.redis.port}"))
private int port;

@Bean
public RedisConnectionFactory redisConnectionFactory(){
return new LettuceConnectionFactory(host, port);
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.config;
package mafia.mafiatogether.global.config;

import static org.springframework.http.HttpHeaders.AUTHORIZATION;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.config;
package mafia.mafiatogether.global.config;

import java.util.List;
import org.springframework.context.annotation.Configuration;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.config.exception;
package mafia.mafiatogether.global.config.exception;

public class AuthException extends GlobalException{
public AuthException(final ExceptionCode code) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.config.exception;
package mafia.mafiatogether.global.config.exception;

import java.time.LocalDateTime;
import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.config.exception;
package mafia.mafiatogether.global.config.exception;

import lombok.Getter;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.config.exception;
package mafia.mafiatogether.global.config.exception;

import lombok.Getter;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package mafia.mafiatogether.config.exception;
package mafia.mafiatogether.global.config.exception;

import java.util.ArrayList;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
import mafia.mafiatogether.config.exception.ErrorResponse.FieldErrorResponse;
import mafia.mafiatogether.global.config.exception.ErrorResponse.FieldErrorResponse;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.BindException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.config.exception;
package mafia.mafiatogether.global.config.exception;

public class PlayerException extends GlobalException{
public PlayerException(final ExceptionCode code) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.config.exception;
package mafia.mafiatogether.global.config.exception;

public class RoomException extends GlobalException{

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package mafia.mafiatogether.job.sevice;
package mafia.mafiatogether.job.application;

import lombok.RequiredArgsConstructor;
import mafia.mafiatogether.job.domain.Player;
import mafia.mafiatogether.room.domain.Room;
import mafia.mafiatogether.room.repository.RoomManager;
import mafia.mafiatogether.job.dto.response.JobResponse;
import mafia.mafiatogether.job.dto.response.MafiaTargetResponse;
import mafia.mafiatogether.job.dto.request.PlayerExecuteAbilityRequest;
import mafia.mafiatogether.job.dto.response.PlayerExecuteAbilityResponse;
import mafia.mafiatogether.room.domain.RoomManager;
import mafia.mafiatogether.job.application.dto.response.JobResponse;
import mafia.mafiatogether.job.application.dto.response.MafiaTargetResponse;
import mafia.mafiatogether.job.application.dto.request.PlayerExecuteAbilityRequest;
import mafia.mafiatogether.job.application.dto.response.PlayerExecuteAbilityResponse;
import org.springframework.stereotype.Service;

@Service
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.job.dto;
package mafia.mafiatogether.job.application.dto;

public record PlayerInfoDto(
String code,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.job.dto.request;
package mafia.mafiatogether.job.application.dto.request;

public record PlayerExecuteAbilityRequest(
String target
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package mafia.mafiatogether.job.application.dto.response;

public record JobResponse(
String job
) {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.job.dto.response;
package mafia.mafiatogether.job.application.dto.response;

public record MafiaTargetResponse(
String target
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.job.dto.response;
package mafia.mafiatogether.job.application.dto.response;

public record PlayerExecuteAbilityResponse(
String job,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.job.dto.response;
package mafia.mafiatogether.job.application.dto.response;

import mafia.mafiatogether.job.domain.Player;
import mafia.mafiatogether.job.domain.JobType;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/mafia/mafiatogether/job/domain/Citizen.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package mafia.mafiatogether.job.domain;

import mafia.mafiatogether.config.exception.PlayerException;
import mafia.mafiatogether.config.exception.ExceptionCode;
import mafia.mafiatogether.global.config.exception.PlayerException;
import mafia.mafiatogether.global.config.exception.ExceptionCode;

public class Citizen implements Job {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/mafia/mafiatogether/job/domain/Police.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package mafia.mafiatogether.job.domain;

import java.util.Objects;
import mafia.mafiatogether.config.exception.ExceptionCode;
import mafia.mafiatogether.config.exception.PlayerException;
import mafia.mafiatogether.global.config.exception.ExceptionCode;
import mafia.mafiatogether.global.config.exception.PlayerException;

public class Police implements Job {

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package mafia.mafiatogether.job.presentation;
package mafia.mafiatogether.job.ui;

import lombok.RequiredArgsConstructor;
import mafia.mafiatogether.config.PlayerInfo;
import mafia.mafiatogether.job.sevice.PlayerService;
import mafia.mafiatogether.job.dto.response.MafiaTargetResponse;
import mafia.mafiatogether.job.dto.request.PlayerExecuteAbilityRequest;
import mafia.mafiatogether.job.dto.response.PlayerExecuteAbilityResponse;
import mafia.mafiatogether.job.dto.PlayerInfoDto;
import mafia.mafiatogether.job.dto.response.JobResponse;
import mafia.mafiatogether.global.config.PlayerInfo;
import mafia.mafiatogether.job.application.PlayerService;
import mafia.mafiatogether.job.application.dto.response.MafiaTargetResponse;
import mafia.mafiatogether.job.application.dto.request.PlayerExecuteAbilityRequest;
import mafia.mafiatogether.job.application.dto.response.PlayerExecuteAbilityResponse;
import mafia.mafiatogether.job.application.dto.PlayerInfoDto;
import mafia.mafiatogether.job.application.dto.response.JobResponse;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
package mafia.mafiatogether.room.service;
package mafia.mafiatogether.room.application;

import io.micrometer.core.instrument.Gauge;
import io.micrometer.core.instrument.MeterRegistry;
import java.time.Clock;
import lombok.RequiredArgsConstructor;
import mafia.mafiatogether.config.exception.ExceptionCode;
import mafia.mafiatogether.config.exception.RoomException;
import mafia.mafiatogether.global.config.exception.ExceptionCode;
import mafia.mafiatogether.global.config.exception.RoomException;
import mafia.mafiatogether.job.domain.Player;
import mafia.mafiatogether.room.domain.Room;
import mafia.mafiatogether.room.repository.RoomManager;
import mafia.mafiatogether.room.domain.RoomManager;
import mafia.mafiatogether.room.domain.status.EndStatus;
import mafia.mafiatogether.room.dto.response.RoomCodeResponse;
import mafia.mafiatogether.room.dto.request.RoomCreateRequest;
import mafia.mafiatogether.room.dto.response.RoomInfoResponse;
import mafia.mafiatogether.room.dto.request.RoomModifyRequest;
import mafia.mafiatogether.room.dto.response.RoomNightResultResponse;
import mafia.mafiatogether.room.dto.response.RoomResultResponse;
import mafia.mafiatogether.room.dto.response.RoomStatusResponse;
import mafia.mafiatogether.room.dto.response.RoomValidateResponse;
import mafia.mafiatogether.room.application.dto.response.RoomCodeResponse;
import mafia.mafiatogether.room.application.dto.request.RoomCreateRequest;
import mafia.mafiatogether.room.application.dto.response.RoomInfoResponse;
import mafia.mafiatogether.room.application.dto.request.RoomModifyRequest;
import mafia.mafiatogether.room.application.dto.response.RoomNightResultResponse;
import mafia.mafiatogether.room.application.dto.response.RoomResultResponse;
import mafia.mafiatogether.room.application.dto.response.RoomStatusResponse;
import mafia.mafiatogether.room.application.dto.response.RoomValidateResponse;
import org.springframework.stereotype.Service;

@Service
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.room.dto.request;
package mafia.mafiatogether.room.application.dto.request;

import mafia.mafiatogether.room.domain.RoomInfo;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.room.dto.request;
package mafia.mafiatogether.room.application.dto.request;

import mafia.mafiatogether.room.domain.status.StatusType;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.room.dto.response;
package mafia.mafiatogether.room.application.dto.response;

public record RoomAuthResponse(
String auth
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.room.dto.response;
package mafia.mafiatogether.room.application.dto.response;

public record RoomCodeResponse(
String code
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package mafia.mafiatogether.room.dto.response;
package mafia.mafiatogether.room.application.dto.response;

import java.sql.Timestamp;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import mafia.mafiatogether.job.domain.Player;
import mafia.mafiatogether.room.domain.Room;
import mafia.mafiatogether.job.dto.response.PlayerResponse;
import mafia.mafiatogether.job.application.dto.response.PlayerResponse;

public record RoomInfoResponse(
Timestamp startTime,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.room.dto.response;
package mafia.mafiatogether.room.application.dto.response;

public record RoomNightResultResponse(
String dead
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.room.dto.response;
package mafia.mafiatogether.room.application.dto.response;

import mafia.mafiatogether.job.domain.Player;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.room.dto.response;
package mafia.mafiatogether.room.application.dto.response;

import java.sql.Timestamp;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package mafia.mafiatogether.room.dto.response;
package mafia.mafiatogether.room.application.dto.response;

import mafia.mafiatogether.room.domain.status.StatusType;

public record RoomStatusResponse(
StatusType statusType

) {
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.room.dto.response;
package mafia.mafiatogether.room.application.dto.response;

public record RoomValidateResponse(
Boolean exist
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package mafia.mafiatogether.room.util;
package mafia.mafiatogether.room.domain;


import java.util.Random;
Expand Down
Loading