Skip to content

Commit

Permalink
Merge pull request #37 from JunKyung-Jo/feat/friend
Browse files Browse the repository at this point in the history
FEAT : friend personality
  • Loading branch information
NameIsUser06 authored Jan 3, 2024
2 parents de2337f + ddcb93a commit 9744546
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.investment.findfriend.domain.chat.domain.Chat;
import com.investment.findfriend.domain.feed.domain.Feed;
import com.investment.findfriend.domain.friend.domain.type.Authority;
import com.investment.findfriend.domain.friend.domain.type.Personality;
import com.investment.findfriend.domain.user.domain.User;
import jakarta.persistence.*;
import lombok.*;
Expand All @@ -29,6 +30,10 @@ public class Friend {
@Column
private Authority authority;

@Enumerated(EnumType.STRING)
@ElementCollection
private List<Personality> personalities;

@ManyToOne
@JoinColumn(name = "user_id")
private User user;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.investment.findfriend.domain.friend.domain.type;

import lombok.RequiredArgsConstructor;

@RequiredArgsConstructor
public enum Personality {
EXTROVERTED("외향적인"),
INTROVERTED("내향적인"),
REALISTIC("현실적인"),
CREATIVE("창의적인"),
ORGANIZED("계획적인"),
EASYGOING("자유분방한"),
SENSITIVE("감성적인"),
RATIONAL("이성적인");

private final String description;
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
package com.investment.findfriend.domain.friend.presentation.dto.request;

import com.investment.findfriend.domain.friend.domain.type.Personality;
import lombok.Getter;

import java.util.List;

@Getter
public class PostFriendRequest {
private String name;
private List<Personality> personalities;
private String statusMessage;
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public ResponseEntity<String> execute(PostFriendRequest request, HttpServletRequ
.statusMessage(request.getStatusMessage())
.authority(Authority.ROLE_CUSTOM)
.name(request.getName())
.personalities(request.getPersonalities())
.build();

friendRepository.save(friend);
Expand Down

0 comments on commit 9744546

Please sign in to comment.