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.

Sign up for GitHub

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

Feat(#58): 키워드 재정의 #62

Merged
merged 1 commit into from
Feb 6, 2025
Merged

Feat(#58): 키워드 재정의 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 49 additions & 0 deletions docs/가치관 유형.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# 가치관 유형

## 기존 유형
슈왈츠의 보편적 가치 이론에 따라 10가지 유형을 정의하였습니다.
1. 자기주도
2. 자극
3. 쾌락
4. 성취
5. 권력
6. 안전
7. 순응
8. 전통
9. 박애
10. 보편주의

Comment on lines +1 to +15
Copy link
Member

Choose a reason for hiding this comment

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

문서화 👍👍👍👍👍

## 변경된 유형
1. 자기주도
2. 모험
3. 안전
4. 안정
Comment on lines +19 to +20
Copy link
Member

Choose a reason for hiding this comment

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

안전이랑 안정이 겹치는 개념같아서 고민이 되네요.

Copy link
Member Author

Choose a reason for hiding this comment

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

처음에 저도 단어 자체 생긴건 비슷해서 문제되지않을까 생각했는데 다시 생각해보니 뜻 자체는 안겹치니까 괜찮지 않을까 생각했습니다 !

이 키워드를 통해 좀 살을 붙여서 클라이언트쪽에 제공해줄 수 있는 방법도 필요 할 것 같아요

Copy link
Collaborator

Choose a reason for hiding this comment

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

안정이 평화로도 될 수 있을 것 같은데 조금 더 고민해봐야 할 것 같아요.
같은 개념보단,, 결과 느낌이네요

현실에 순응함, 현재 생활에 만족함 -> 평화로운 생활

5. 성공
6. 박애
7. 보편주의

모험 : 쾌락 + 자극
안정 : 전통 + 순응
성공 : 권력 + 성취

### 해당 유형에 대한 ENUM
```java
public enum Keyword {
SELF_DIRECTION("자기주도"),
ADVENTURE("모험"),
SECURITY("안전"),
STABILITY("안정"),
SUCCESS("성공"),
BENEVOLENCE("박애"),
UNIVERSALISM("보편주의");

private final String description;

Keyword(String description) {
this.description = description;
}
}
```

## 변경 사유
기존의 슈왈츠 보편적 가치이론의 10가지 키워드를 가지고 진행하려고 하였으나 개발 및 디자인 측면에서 어려움이 있어서 다음과 같이 변경하였습니다.
11 changes: 4 additions & 7 deletions jaknaeso-core/src/main/java/org/nexters/jaknaesocore/domain/survey/model/Keyword.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,12 @@

public enum Keyword {
SELF_DIRECTION("자기주도"),
STIMULATION("자극"),
HEDONISM("쾌락"),
ACHIEVEMENT("성취"),
POWER("권력"),
ADVENTURE("모험"),
SECURITY("안전"),
CONFORMITY("순응"),
TRADITION("전통"),
STABILITY("안정"),
SUCCESS("성공"),
BENEVOLENCE("박애"),
UNIVERSALISM("보편");
UNIVERSALISM("보편주의");

private final String description;

Expand Down
4 changes: 2 additions & 2 deletions ...e/src/test/java/org/nexters/jaknaesocore/domain/survey/model/SurveySubscriptionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ void getSubmittedSurvey() {

List<KeywordScore> scores =
List.of(
KeywordScore.builder().keyword(Keyword.ACHIEVEMENT).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.ADVENTURE).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.BENEVOLENCE).score(BigDecimal.TWO).build());

SurveyOption option1 =
Expand Down Expand Up @@ -63,7 +63,7 @@ void getSubmittedSurvey_OtherMember() {

List<KeywordScore> scores =
List.of(
KeywordScore.builder().keyword(Keyword.ACHIEVEMENT).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.ADVENTURE).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.BENEVOLENCE).score(BigDecimal.TWO).build());

SurveyOption option1 =
Expand Down
6 changes: 3 additions & 3 deletions ...ava/org/nexters/jaknaesocore/domain/survey/repository/SurveySubmissionRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void findByMember_IdAndDeletedAtIsNull() {
surveyRepository.save(balanceSurvey);
List<KeywordScore> scores =
List.of(
KeywordScore.builder().keyword(Keyword.ACHIEVEMENT).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.ADVENTURE).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.BENEVOLENCE).score(BigDecimal.TWO).build());
SurveyOption option =
SurveyOption.builder().survey(balanceSurvey).scores(scores).content("질문 옵션 내용").build();
Expand Down Expand Up @@ -83,7 +83,7 @@ void findByMember_IdAndDeletedAtIsNull() {
surveyRepository.saveAll(List.of(survey1, survey2, survey3, survey4));
List<KeywordScore> scores =
List.of(
KeywordScore.builder().keyword(Keyword.ACHIEVEMENT).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.ADVENTURE).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.BENEVOLENCE).score(BigDecimal.TWO).build());
SurveyOption option1 =
SurveyOption.builder().survey(survey1).scores(scores).content("한다.").build();
Expand Down Expand Up @@ -132,7 +132,7 @@ void findByMember_IdAndDeletedAtIsNull() {
surveyRepository.saveAll(List.of(survey1, survey2, survey3, survey4));
List<KeywordScore> scores =
List.of(
KeywordScore.builder().keyword(Keyword.ACHIEVEMENT).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.ADVENTURE).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.BENEVOLENCE).score(BigDecimal.TWO).build());
SurveyOption option1 =
SurveyOption.builder().survey(survey1).scores(scores).content("한다.").build();
Expand Down
16 changes: 8 additions & 8 deletions ...-core/src/test/java/org/nexters/jaknaesocore/domain/survey/service/SurveyServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void getNextSurvey() {
surveyRepository.save(balanceSurvey);
List<KeywordScore> scores =
List.of(
KeywordScore.builder().keyword(Keyword.ACHIEVEMENT).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.ADVENTURE).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.BENEVOLENCE).score(BigDecimal.TWO).build());
SurveyOption option =
SurveyOption.builder().survey(balanceSurvey).scores(scores).content("질문 옵션 내용").build();
Expand Down Expand Up @@ -94,7 +94,7 @@ void throwMemberNotFoundException() {
surveyRepository.save(balanceSurvey);
List<KeywordScore> scores =
List.of(
KeywordScore.builder().keyword(Keyword.ACHIEVEMENT).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.ADVENTURE).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.BENEVOLENCE).score(BigDecimal.TWO).build());
SurveyOption option =
SurveyOption.builder().survey(balanceSurvey).scores(scores).content("질문 옵션 내용").build();
Expand Down Expand Up @@ -124,7 +124,7 @@ class shouldSubmitted {
surveyRepository.save(balanceSurvey);
List<KeywordScore> scores =
List.of(
KeywordScore.builder().keyword(Keyword.ACHIEVEMENT).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.ADVENTURE).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.BENEVOLENCE).score(BigDecimal.TWO).build());
SurveyOption option =
SurveyOption.builder().survey(balanceSurvey).scores(scores).content("질문 옵션 내용").build();
Expand Down Expand Up @@ -159,7 +159,7 @@ void throwSurveyNotFoundException() {
surveyRepository.save(balanceSurvey);
List<KeywordScore> scores =
List.of(
KeywordScore.builder().keyword(Keyword.ACHIEVEMENT).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.ADVENTURE).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.BENEVOLENCE).score(BigDecimal.TWO).build());
SurveyOption option =
SurveyOption.builder().survey(balanceSurvey).scores(scores).content("질문 옵션 내용").build();
Expand Down Expand Up @@ -191,7 +191,7 @@ void throwSurveyNotFoundException() {
surveyRepository.saveAll(List.of(survey1, survey2, survey3, survey4));
List<KeywordScore> scores =
List.of(
KeywordScore.builder().keyword(Keyword.ACHIEVEMENT).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.ADVENTURE).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.BENEVOLENCE).score(BigDecimal.TWO).build());
SurveyOption option1 =
SurveyOption.builder().survey(survey1).scores(scores).content("한다.").build();
Expand Down Expand Up @@ -230,7 +230,7 @@ void throwSurveyNotFoundException() {
surveyRepository.saveAll(List.of(survey1, survey2, survey3, survey4));
List<KeywordScore> scores =
List.of(
KeywordScore.builder().keyword(Keyword.ACHIEVEMENT).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.ADVENTURE).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.BENEVOLENCE).score(BigDecimal.TWO).build());
SurveyOption option1 =
SurveyOption.builder().survey(survey1).scores(scores).content("한다.").build();
Expand Down Expand Up @@ -283,7 +283,7 @@ void throwSurveyNotFoundException() {

List<KeywordScore> scores =
List.of(
KeywordScore.builder().keyword(Keyword.ACHIEVEMENT).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.ADVENTURE).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.BENEVOLENCE).score(BigDecimal.TWO).build());

SurveyOption option1 =
Expand Down Expand Up @@ -335,7 +335,7 @@ void throwSurveyNotFoundException() {

List<KeywordScore> scores =
List.of(
KeywordScore.builder().keyword(Keyword.ACHIEVEMENT).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.ADVENTURE).score(BigDecimal.ONE).build(),
KeywordScore.builder().keyword(Keyword.BENEVOLENCE).score(BigDecimal.TWO).build());

SurveyOption option1 =
Expand Down