-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #39 from Took-Talk/develop
Fix :: resolved error that password was deleted when requesting matching
- Loading branch information
Showing
4 changed files
with
56 additions
and
18 deletions.
There are no files selected for viewing
4 changes: 2 additions & 2 deletions
4
src/main/java/com/mirae/tooktalk/domain/chat/dto/response/MatchingResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
package com.mirae.tooktalk.domain.chat.dto.response; | ||
|
||
import com.mirae.tooktalk.domain.user.entity.user.UserEntity; | ||
import com.mirae.tooktalk.domain.user.payload.response.UserDto; | ||
import lombok.Builder; | ||
|
||
@Builder | ||
public record MatchingResponse ( | ||
int roomId, | ||
|
||
UserEntity userInfo, | ||
UserDto userInfo, | ||
|
||
boolean matching | ||
){} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
src/main/java/com/mirae/tooktalk/domain/user/payload/response/UserDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
package com.mirae.tooktalk.domain.user.payload.response; | ||
|
||
import lombok.Builder; | ||
import lombok.Getter; | ||
|
||
import java.time.LocalDateTime; | ||
import java.util.List; | ||
|
||
@Builder | ||
@Getter | ||
public class UserDto { | ||
|
||
private int id; | ||
|
||
private String number; | ||
|
||
private String password; | ||
|
||
private String nickname; | ||
|
||
private String age; | ||
|
||
private String gender; | ||
|
||
private String mbti; | ||
|
||
private List<String> interests; | ||
|
||
private String imgUrl; | ||
|
||
private String bio; | ||
|
||
private LocalDateTime createdAt; | ||
|
||
private int status; | ||
|
||
} |