Skip to content

Commit 2d2ae85

Browse files
committed
Merge branch 'dev'
2 parents 5db0e8e + 14fe0ad commit 2d2ae85

File tree

59 files changed

+3150
-184
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+3150
-184
lines changed

backend/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,9 @@ dependencies {
100100
// --- AWS ---
101101
implementation("software.amazon.awssdk:s3")
102102

103+
// --- Email ---
104+
implementation("org.springframework.boot:spring-boot-starter-mail")
105+
103106
// --- Test ---
104107
testImplementation("org.springframework.boot:spring-boot-starter-test") {
105108
exclude(group = "org.junit.vintage", module = "junit-vintage-engine")

backend/src/main/java/com/deliveranything/domain/auth/controller/AuthController.java renamed to backend/src/main/java/com/deliveranything/domain/auth/auth/controller/AuthController.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package com.deliveranything.domain.auth.controller;
2-
3-
import com.deliveranything.domain.auth.dto.LoginRequest;
4-
import com.deliveranything.domain.auth.dto.LoginResponse;
5-
import com.deliveranything.domain.auth.dto.SignupRequest;
6-
import com.deliveranything.domain.auth.dto.SignupResponse;
7-
import com.deliveranything.domain.auth.service.AuthService;
8-
import com.deliveranything.domain.auth.service.RefreshTokenService;
1+
package com.deliveranything.domain.auth.auth.controller;
2+
3+
import com.deliveranything.domain.auth.auth.dto.LoginRequest;
4+
import com.deliveranything.domain.auth.auth.dto.LoginResponse;
5+
import com.deliveranything.domain.auth.auth.dto.SignupRequest;
6+
import com.deliveranything.domain.auth.auth.dto.SignupResponse;
7+
import com.deliveranything.domain.auth.auth.service.AuthService;
8+
import com.deliveranything.domain.auth.auth.service.RefreshTokenService;
99
import com.deliveranything.domain.user.profile.enums.ProfileType;
1010
import com.deliveranything.domain.user.profile.service.ProfileService;
1111
import com.deliveranything.domain.user.user.entity.User;

backend/src/main/java/com/deliveranything/domain/auth/dto/LoginRequest.java renamed to backend/src/main/java/com/deliveranything/domain/auth/auth/dto/LoginRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.deliveranything.domain.auth.dto;
1+
package com.deliveranything.domain.auth.auth.dto;
22

33
import jakarta.validation.constraints.Email;
44
import jakarta.validation.constraints.NotBlank;

backend/src/main/java/com/deliveranything/domain/auth/dto/LoginResponse.java renamed to backend/src/main/java/com/deliveranything/domain/auth/auth/dto/LoginResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.deliveranything.domain.auth.dto;
1+
package com.deliveranything.domain.auth.auth.dto;
22

33
import com.deliveranything.domain.user.profile.enums.ProfileType;
44
import java.util.List;

backend/src/main/java/com/deliveranything/domain/auth/dto/RefreshTokenDto.java renamed to backend/src/main/java/com/deliveranything/domain/auth/auth/dto/RefreshTokenDto.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.deliveranything.domain.auth.dto;
1+
package com.deliveranything.domain.auth.auth.dto;
22

33
import com.fasterxml.jackson.annotation.JsonIgnore;
44
import java.io.Serializable;

backend/src/main/java/com/deliveranything/domain/auth/dto/SignupRequest.java renamed to backend/src/main/java/com/deliveranything/domain/auth/auth/dto/SignupRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.deliveranything.domain.auth.dto;
1+
package com.deliveranything.domain.auth.auth.dto;
22

33
import jakarta.validation.constraints.Email;
44
import jakarta.validation.constraints.NotBlank;

backend/src/main/java/com/deliveranything/domain/auth/dto/SignupResponse.java renamed to backend/src/main/java/com/deliveranything/domain/auth/auth/dto/SignupResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.deliveranything.domain.auth.dto;
1+
package com.deliveranything.domain.auth.auth.dto;
22

33
import lombok.Builder;
44

backend/src/main/java/com/deliveranything/domain/auth/dto/SwitchProfileResult.java renamed to backend/src/main/java/com/deliveranything/domain/auth/auth/dto/SwitchProfileResult.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.deliveranything.domain.auth.dto;
1+
package com.deliveranything.domain.auth.auth.dto;
22

33
import com.deliveranything.domain.user.profile.dto.SwitchProfileResponse;
44
import lombok.Builder;
@@ -8,4 +8,5 @@ public record SwitchProfileResult(
88
SwitchProfileResponse switchProfileResponse,
99
String accessToken
1010
) {
11+
1112
}

backend/src/main/java/com/deliveranything/domain/auth/enums/SocialProvider.java renamed to backend/src/main/java/com/deliveranything/domain/auth/auth/enums/SocialProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.deliveranything.domain.auth.enums;
1+
package com.deliveranything.domain.auth.auth.enums;
22

33
public enum SocialProvider {
44
LOCAL("일반 로그인"),

backend/src/main/java/com/deliveranything/domain/auth/repository/RefreshTokenRepository.java renamed to backend/src/main/java/com/deliveranything/domain/auth/auth/repository/RefreshTokenRepository.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.deliveranything.domain.auth.repository;
1+
package com.deliveranything.domain.auth.auth.repository;
22

3-
import com.deliveranything.domain.auth.dto.RefreshTokenDto;
3+
import com.deliveranything.domain.auth.auth.dto.RefreshTokenDto;
44
import com.fasterxml.jackson.databind.ObjectMapper;
55
import java.util.Optional;
66
import java.util.Set;

0 commit comments

Comments
 (0)