Skip to content

Commit

Permalink
πŸ”€ :: develop -> ma-445
Browse files Browse the repository at this point in the history
  • Loading branch information
HyunSu1768 committed Mar 8, 2024
2 parents 184c7cd + 3ab62a8 commit decab67
Show file tree
Hide file tree
Showing 58 changed files with 109 additions and 109 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.info.maeumgagym.adapter.auth
package com.info.maeumgagym.auth

import com.info.maeumgagym.auth.port.out.ReadCurrentUserPort
import com.info.maeumgagym.global.security.principle.CustomUserDetails
import com.info.maeumgagym.security.principle.CustomUserDetails
import com.info.maeumgagym.user.model.User
import org.springframework.security.core.context.SecurityContextHolder
import org.springframework.stereotype.Component
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.info.maeumgagym.adapter.auth
package com.info.maeumgagym.auth

import com.info.maeumgagym.common.exception.BusinessLogicException
import com.info.maeumgagym.user.model.User
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.info.maeumgagym.adapter.auth
package com.info.maeumgagym.auth.oauth.apple

import com.info.maeumgagym.auth.port.out.AppleJwtParsePort
import com.info.maeumgagym.auth.port.out.GeneratePublicKeyPort
import com.info.maeumgagym.auth.port.out.GetJwtBodyPort
import com.info.maeumgagym.auth.port.out.ParseAppleTokenPort
import com.info.maeumgagym.common.exception.FeignException
import com.info.maeumgagym.common.exception.MaeumGaGymException
import com.info.maeumgagym.feign.oauth.apple.AppleClient
import com.info.maeumgagym.auth.oauth.apple.feign.AppleClient
import io.jsonwebtoken.Claims
import org.springframework.stereotype.Component

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.info.maeumgagym.adapter.auth
package com.info.maeumgagym.auth.oauth.apple

import com.info.maeumgagym.auth.dto.response.ApplePublicKeyResponse
import com.info.maeumgagym.auth.dto.response.ApplePublicKeysResponse
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.info.maeumgagym.feign.oauth.apple
package com.info.maeumgagym.auth.oauth.apple.feign

import com.info.maeumgagym.feign.oauth.apple.dto.ApplePublicKeysFeignResponse
import com.info.maeumgagym.global.config.feign.FeignConfig
import com.info.maeumgagym.auth.oauth.apple.feign.dto.ApplePublicKeysFeignResponse
import com.info.maeumgagym.feign.config.FeignConfig
import org.springframework.cloud.openfeign.FeignClient
import org.springframework.web.bind.annotation.GetMapping

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.info.maeumgagym.feign.oauth.apple.dto
package com.info.maeumgagym.auth.oauth.apple.feign.dto

import com.info.maeumgagym.auth.dto.response.ApplePublicKeyResponse

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.info.maeumgagym.feign.oauth.apple.dto
package com.info.maeumgagym.auth.oauth.apple.feign.dto

import com.info.maeumgagym.auth.dto.response.ApplePublicKeysResponse

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.info.maeumgagym.adapter.auth
package com.info.maeumgagym.auth.oauth.google

import com.info.maeumgagym.auth.dto.response.GoogleInfoResponse
import com.info.maeumgagym.auth.oauth.google.feign.GoogleAuthClient
import com.info.maeumgagym.auth.oauth.google.feign.GoogleInfoClient
import com.info.maeumgagym.auth.port.out.GetGoogleInfoPort
import com.info.maeumgagym.auth.port.out.RevokeGoogleTokenPort
import com.info.maeumgagym.common.exception.FeignException
import com.info.maeumgagym.common.exception.MaeumGaGymException
import com.info.maeumgagym.common.exception.SecurityException
import com.info.maeumgagym.feign.oauth.google.GoogleAuthClient
import com.info.maeumgagym.feign.oauth.google.GoogleInfoClient
import org.springframework.stereotype.Component

@Component
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.info.maeumgagym.feign.oauth.google
package com.info.maeumgagym.auth.oauth.google.feign

import com.info.maeumgagym.global.config.feign.FeignConfig
import com.info.maeumgagym.feign.config.FeignConfig
import org.springframework.cloud.openfeign.FeignClient
import org.springframework.web.bind.annotation.PostMapping
import org.springframework.web.bind.annotation.RequestParam
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.info.maeumgagym.feign.oauth.google
package com.info.maeumgagym.auth.oauth.google.feign

import com.info.maeumgagym.feign.oauth.google.dto.GoogleInfoFeignResponse
import com.info.maeumgagym.global.config.feign.FeignConfig
import com.info.maeumgagym.auth.oauth.google.feign.dto.GoogleInfoFeignResponse
import com.info.maeumgagym.feign.config.FeignConfig
import org.springframework.cloud.openfeign.FeignClient
import org.springframework.web.bind.annotation.GetMapping
import org.springframework.web.bind.annotation.RequestParam
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.info.maeumgagym.feign.oauth.google.dto
package com.info.maeumgagym.auth.oauth.google.feign.dto

import com.info.maeumgagym.auth.dto.response.GoogleInfoResponse

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.info.maeumgagym.adapter.auth
package com.info.maeumgagym.auth.oauth.kakao

import com.info.maeumgagym.auth.dto.response.KakaoInfoResponse
import com.info.maeumgagym.auth.oauth.kakao.feign.KakaoInfoClient
import com.info.maeumgagym.auth.port.out.GetKakaoInfoPort
import com.info.maeumgagym.common.exception.FeignException
import com.info.maeumgagym.common.exception.MaeumGaGymException
import com.info.maeumgagym.common.exception.SecurityException
import com.info.maeumgagym.feign.oauth.kakao.KakaoInfoClient
import org.springframework.stereotype.Component

@Component
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.info.maeumgagym.feign.oauth.kakao
package com.info.maeumgagym.auth.oauth.kakao.feign

import com.info.maeumgagym.feign.oauth.kakao.dto.KakaoInfoFeignResponse
import com.info.maeumgagym.global.config.feign.FeignConfig
import com.info.maeumgagym.auth.oauth.kakao.feign.dto.KakaoInfoFeignResponse
import com.info.maeumgagym.feign.config.FeignConfig
import org.springframework.cloud.openfeign.FeignClient
import org.springframework.web.bind.annotation.PostMapping
import org.springframework.web.bind.annotation.RequestHeader
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.info.maeumgagym.feign.oauth.kakao.dto
package com.info.maeumgagym.auth.oauth.kakao.feign.dto

import com.info.maeumgagym.auth.dto.response.KakaoInfoResponse
import com.info.maeumgagym.auth.dto.response.PropertiesResponse
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.info.maeumgagym.feign.oauth.kakao.dto
package com.info.maeumgagym.auth.oauth.kakao.feign.dto

data class PropertiesFeignResponse(
val nickname: String
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.info.maeumgagym.global.error
package com.info.maeumgagym.error

import com.fasterxml.jackson.databind.ObjectMapper
import com.info.maeumgagym.global.env.security.CSRFProperties
import com.info.maeumgagym.security.env.CSRFProperties
import mu.KLogger
import mu.KotlinLogging
import org.springframework.core.log.LogMessage
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.info.maeumgagym.global.error
package com.info.maeumgagym.error

import com.fasterxml.jackson.databind.ObjectMapper
import mu.KLogger
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.info.maeumgagym.global.error
package com.info.maeumgagym.error

data class ErrorResponse(
val status: Int,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.info.maeumgagym.global.error.filter
package com.info.maeumgagym.error.filter

import com.fasterxml.jackson.databind.ObjectMapper
import com.info.maeumgagym.common.exception.*
import com.info.maeumgagym.global.config.filter.FilterChainConfig
import com.info.maeumgagym.global.error.log.ErrorLog
import com.info.maeumgagym.error.log.ErrorLog
import org.apache.catalina.core.ApplicationFilterChain
import org.springframework.http.MediaType
import org.springframework.security.web.SecurityFilterChain
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.info.maeumgagym.global.error.filter
package com.info.maeumgagym.error.filter

import com.info.maeumgagym.common.exception.MaeumGaGymException
import com.info.maeumgagym.common.exception.PresentationValidationException
import com.info.maeumgagym.global.config.filter.FilterChainConfig
import com.info.maeumgagym.global.error.log.ErrorLog
import com.info.maeumgagym.error.log.ErrorLog
import org.apache.catalina.core.ApplicationFilterChain
import org.springframework.security.web.SecurityFilterChain
import org.springframework.web.bind.MethodArgumentNotValidException
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.info.maeumgagym.global.error.log
package com.info.maeumgagym.error.log

import java.time.LocalDateTime
import java.util.*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.info.maeumgagym.global.config.feign
package com.info.maeumgagym.feign.config

import com.info.maeumgagym.feign.error.FeignClientErrorDecoder
import feign.Logger
Expand All @@ -9,7 +9,7 @@ import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
import org.springframework.context.annotation.Import

@EnableFeignClients(basePackages = ["com.info.maeumgagym.feign"])
@EnableFeignClients(basePackages = ["com.info.maeumgagym"])
@Configuration
@Import(FeignClientErrorDecoder::class)
class FeignConfig {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.info.maeumgagym.global.file
package com.info.maeumgagym.fileserver

import com.info.maeumgagym.global.file.entity.VideoIdAndUploaderIdRedisEntity
import com.info.maeumgagym.fileserver.entity.VideoIdAndUploaderIdRedisEntity
import org.springframework.data.repository.Repository

interface VideoIdAndUploaderIdRepository : Repository<VideoIdAndUploaderIdRedisEntity, String> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.info.maeumgagym.adapter.file
package com.info.maeumgagym.fileserver.adapter

import com.info.maeumgagym.common.exception.FeignException
import com.info.maeumgagym.common.exception.MaeumGaGymException
import com.info.maeumgagym.feign.file.FileClient
import com.info.maeumgagym.feign.file.dto.request.PreSignedUploadURLFeignRequest
import com.info.maeumgagym.global.env.file.FileProperties
import com.info.maeumgagym.fileserver.feign.FileClient
import com.info.maeumgagym.fileserver.feign.dto.request.PreSignedUploadURLFeignRequest
import com.info.maeumgagym.fileserver.env.FileProperties
import com.info.maeumgagym.pickle.dto.PreSignedUploadURLDto
import com.info.maeumgagym.pickle.port.out.DeleteOriginalVideoPort
import com.info.maeumgagym.pickle.port.out.GenerateM3u8URLPort
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.info.maeumgagym.adapter.file
package com.info.maeumgagym.fileserver.adapter

import com.info.maeumgagym.global.env.file.FileProperties
import com.info.maeumgagym.global.file.VideoIdAndUploaderIdRepository
import com.info.maeumgagym.global.file.entity.VideoIdAndUploaderIdRedisEntity
import com.info.maeumgagym.fileserver.env.FileProperties
import com.info.maeumgagym.fileserver.VideoIdAndUploaderIdRepository
import com.info.maeumgagym.fileserver.entity.VideoIdAndUploaderIdRedisEntity
import com.info.maeumgagym.pickle.model.VideoIdAndUploaderId
import com.info.maeumgagym.pickle.port.out.ReadVideoIdAndUploaderIdPort
import com.info.maeumgagym.pickle.port.out.SaveVideoIdAndUploaderIdPort
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.info.maeumgagym.adapter.file
package com.info.maeumgagym.fileserver.adapter

import com.info.maeumgagym.daily.port.out.DeleteImageObjectPort
import com.info.maeumgagym.daily.port.out.GetPreSignedImageUploadURL
import com.info.maeumgagym.global.env.file.MinIOProperties
import com.info.maeumgagym.fileserver.env.MinIOProperties
import io.minio.GetPresignedObjectUrlArgs
import io.minio.MinioClient
import io.minio.PutObjectArgs
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.info.maeumgagym.global.file.entity
package com.info.maeumgagym.fileserver.entity

import org.springframework.data.annotation.Id
import org.springframework.data.redis.core.RedisHash
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.info.maeumgagym.global.env.file
package com.info.maeumgagym.fileserver.env

import org.springframework.boot.context.properties.ConfigurationProperties
import org.springframework.boot.context.properties.ConstructorBinding
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.info.maeumgagym.global.env.file
package com.info.maeumgagym.fileserver.env

import org.springframework.boot.context.properties.ConfigurationProperties
import org.springframework.boot.context.properties.ConstructorBinding
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.info.maeumgagym.feign.file
package com.info.maeumgagym.fileserver.feign

import com.info.maeumgagym.feign.file.dto.request.PreSignedUploadURLFeignRequest
import com.info.maeumgagym.feign.file.dto.response.FilePreSignedUploadURLFeignResponse
import com.info.maeumgagym.global.config.feign.FeignConfig
import com.info.maeumgagym.fileserver.feign.dto.request.PreSignedUploadURLFeignRequest
import com.info.maeumgagym.fileserver.feign.dto.response.FilePreSignedUploadURLFeignResponse
import com.info.maeumgagym.feign.config.FeignConfig
import org.springframework.cloud.openfeign.FeignClient
import org.springframework.web.bind.annotation.*

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.info.maeumgagym.feign.file.dto.request
package com.info.maeumgagym.fileserver.feign.dto.request

import javax.validation.constraints.NotBlank

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.info.maeumgagym.feign.file.dto.response
package com.info.maeumgagym.fileserver.feign.dto.response

import com.fasterxml.jackson.annotation.JsonProperty

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.info.maeumgagym.global.config.minio
package com.info.maeumgagym.fileserver.minio.config

import com.info.maeumgagym.global.env.file.MinIOProperties
import com.info.maeumgagym.fileserver.env.MinIOProperties
import io.minio.MinioClient
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package com.info.maeumgagym.global.config.filter

import com.fasterxml.jackson.databind.ObjectMapper
import com.info.maeumgagym.common.exception.CriticalException
import com.info.maeumgagym.global.error.filter.ErrorLogResponseFilter
import com.info.maeumgagym.global.error.filter.ExceptionConvertFilter
import com.info.maeumgagym.error.filter.ErrorLogResponseFilter
import com.info.maeumgagym.error.filter.ExceptionConvertFilter
import org.apache.catalina.core.ApplicationFilterChain
import org.springframework.boot.web.servlet.FilterRegistrationBean
import org.springframework.security.web.SecurityFilterChain
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ package com.info.maeumgagym.global.config.scan
import org.springframework.boot.context.properties.ConfigurationPropertiesScan
import org.springframework.context.annotation.Configuration

@ConfigurationPropertiesScan(basePackages = ["com.info.maeumgagym.global.env"])
@ConfigurationPropertiesScan(basePackages = ["com.info.maeumgagym"])
@Configuration
class PropertiesScanConfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.info.maeumgagym.global.config.scheduler
package com.info.maeumgagym.scheduler.config

import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.info.maeumgagym.global.config.security
package com.info.maeumgagym.security.config

import com.info.maeumgagym.global.env.security.SecurityProperties
import com.info.maeumgagym.security.env.SecurityProperties
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
import org.springframework.web.cors.CorsConfiguration
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.info.maeumgagym.global.config.security
package com.info.maeumgagym.security.config

import com.info.maeumgagym.user.model.Role
import org.springframework.http.HttpMethod
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.info.maeumgagym.global.config.security
package com.info.maeumgagym.security.config

import com.info.maeumgagym.global.env.security.CSRFProperties
import com.info.maeumgagym.global.error.CustomAccessDeniedHandler
import com.info.maeumgagym.global.error.CustomAuthenticationEntryPoint
import com.info.maeumgagym.security.env.CSRFProperties
import com.info.maeumgagym.error.CustomAccessDeniedHandler
import com.info.maeumgagym.error.CustomAuthenticationEntryPoint
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
import org.springframework.security.config.annotation.web.builders.HttpSecurity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.info.maeumgagym.global.config.security
package com.info.maeumgagym.security.config

import com.fasterxml.jackson.databind.ObjectMapper
import com.info.maeumgagym.global.error.filter.ErrorLogResponseFilter
import com.info.maeumgagym.global.error.filter.ExceptionConvertFilter
import com.info.maeumgagym.global.jwt.JwtFilter
import com.info.maeumgagym.error.filter.ErrorLogResponseFilter
import com.info.maeumgagym.error.filter.ExceptionConvertFilter
import com.info.maeumgagym.security.jwt.JwtFilter
import org.springframework.security.config.annotation.SecurityConfigurerAdapter
import org.springframework.security.config.annotation.web.builders.HttpSecurity
import org.springframework.security.web.DefaultSecurityFilterChain
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.info.maeumgagym.global.config.security
package com.info.maeumgagym.security.config

import org.springframework.beans.factory.annotation.Value
import org.springframework.context.annotation.Bean
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.info.maeumgagym.global.env.security
package com.info.maeumgagym.security.env

import org.springframework.boot.context.properties.ConfigurationProperties
import org.springframework.boot.context.properties.ConstructorBinding
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.info.maeumgagym.global.env.security
package com.info.maeumgagym.security.env

import org.springframework.boot.context.properties.ConfigurationProperties
import org.springframework.boot.context.properties.ConstructorBinding
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.info.maeumgagym.global.jwt
package com.info.maeumgagym.security.jwt

import com.fasterxml.jackson.core.JsonProcessingException
import com.fasterxml.jackson.databind.ObjectMapper
Expand Down
Loading

0 comments on commit decab67

Please sign in to comment.