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.

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] 프로필 정보를 등록하는 기능을 구현한다. #14

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

### IntelliJ IDEA ###
.DS_Store
.idea
*.iws
*.iml
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/hibit2/hibit2/auth/service/AuthService.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import com.hibit2.hibit2.auth.dto.TokenResponse;
import com.hibit2.hibit2.auth.support.JwtTokenProvider;
import com.hibit2.hibit2.auth.support.OAuthClient;
import com.hibit2.hibit2.domain.member.domain.Member;
import com.hibit2.hibit2.domain.member.domain.Role;
import com.hibit2.hibit2.domain.member.service.MemberService;
import com.hibit2.hibit2.member.domain.Member;
import com.hibit2.hibit2.member.domain.Role;
import com.hibit2.hibit2.member.service.MemberService;
import com.hibit2.hibit2.auth.support.OAuthEndpoint;
import com.hibit2.hibit2.auth.dto.OAuthMember;

Expand Down
13 changes: 0 additions & 13 deletions src/main/java/com/hibit2/hibit2/controller/Sample.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hibit2.hibit2.domain.member.domain;
package com.hibit2.hibit2.member.domain;

import java.util.regex.Matcher;
import java.util.regex.Pattern;
Expand All @@ -12,7 +12,7 @@
import javax.persistence.Id;
import javax.persistence.Table;

import com.hibit2.hibit2.domain.member.exception.InvalidMemberException;
import com.hibit2.hibit2.member.exception.InvalidMemberException;

import lombok.Getter;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hibit2.hibit2.domain.member.domain;
package com.hibit2.hibit2.member.domain;

import java.util.Optional;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hibit2.hibit2.domain.member.domain;
package com.hibit2.hibit2.member.domain;

import lombok.Getter;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hibit2.hibit2.domain.member.exception;
package com.hibit2.hibit2.member.exception;

public class InvalidMemberException extends RuntimeException{

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hibit2.hibit2.domain.member.exception;
package com.hibit2.hibit2.member.exception;

public class NoSuchMemberException extends RuntimeException{

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.hibit2.hibit2.domain.member.service;
package com.hibit2.hibit2.member.service;

import com.hibit2.hibit2.member.domain.Member;
import com.hibit2.hibit2.member.domain.MemberRepository;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.hibit2.hibit2.domain.member.domain.Member;
import com.hibit2.hibit2.domain.member.domain.MemberRepository;
import com.hibit2.hibit2.domain.member.exception.NoSuchMemberException;
import com.hibit2.hibit2.member.exception.NoSuchMemberException;

@Transactional(readOnly = true)
@Service
Expand Down
14 changes: 14 additions & 0 deletions src/main/java/com/hibit2/hibit2/profile/domain/AddressCity.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.hibit2.hibit2.profile.domain;

import lombok.Getter;
import lombok.RequiredArgsConstructor;

@Getter
@RequiredArgsConstructor
public enum AddressCity {

NEW_YORK(1, "뉴욕");

private final int index;
private final String name;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.hibit2.hibit2.profile.domain;


import lombok.Getter;
import lombok.RequiredArgsConstructor;

@Getter
@RequiredArgsConstructor
public enum AddressDistinct {

MANHATTAN(1, "맨하튼");

private final int index;
private final String name;
}
20 changes: 20 additions & 0 deletions src/main/java/com/hibit2/hibit2/profile/domain/Personality.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.hibit2.hibit2.profile.domain;

import lombok.Getter;

import javax.persistence.Enumerated;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;

@Getter
public class Personality {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
long id;

@Enumerated
PersonalityType personalityType;

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package com.hibit2.hibit2.profile.domain;

import lombok.Getter;
import lombok.RequiredArgsConstructor;

@Getter
@RequiredArgsConstructor
public enum PersonalityType {

TYPE_1(1, "지적한"),
TYPE_2(2, "차분한"),
TYPE_3(3, "유머있는"),
TYPE_4(4, "낙천적인"),
TYPE_5(5, "내향적인"),
TYPE_6(6, "외향적인"),
TYPE_7(7, "감성적인"),
TYPE_8(8, "상냥한"),
TYPE_9(9, "귀여운"),
TYPE_10(10, "열정적인"),
TYPE_11(11, "듬직한"),
TYPE_12(12, "개성있는"),
TYPE_13(13, "친절한"),
TYPE_14(14, "사려 깊은"),
TYPE_15(15, "창의적인"),
TYPE_16(16, "책임감이 강한"),
TYPE_17(17, "에너제틱한"),
TYPE_18(18, "겸손한"),
TYPE_19(19, "카리스마 있는"),
TYPE_20(20, "적응력이 좋은"),
TYPE_21(21, "섬세한"),
TYPE_22(22, "야심적인"),
TYPE_23(23, "계획적인"),
TYPE_24(24, "진취적인");


private final int index;
private final String contents;

}
70 changes: 70 additions & 0 deletions src/main/java/com/hibit2/hibit2/profile/domain/Profile.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
package com.hibit2.hibit2.profile.domain;

import com.hibit2.hibit2.member.exception.InvalidMemberException;
import lombok.Getter;

import javax.persistence.*;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

@Table(name = "profiles")
@Getter
@Entity
public class Profile {

private static final Pattern EMAIL_PATTERN = Pattern.compile("^[a-z0-9._-]+@[a-z]+[.]+[a-z]{2,3}$");

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "idx", nullable = false)
private int idx;

@Column(name = "nickname", length = 20, nullable = false)
private String nickname;

@Column(name = "gender", nullable = false)
private int age;

@Column(name = "gender", nullable = false)
private int gender;

@Column(name = "personality", nullable = false)
private PersonalityType personality;

@Column(name ="introduce", length = 200, nullable = false)
private String introduce;

@Column(name = "main_img", length = 100, nullable = false)
private String mainImg;

@Column(name = "job", length = 50, nullable = false)
private String job;

@Column(name = "address_city", nullable = false)
private Enum addressCity;

@Column(name = "address_distinct", nullable = false)
private Enum addressDistinct;

@Column(name = "ban")
private int ban;

protected Profile() {
}

public Profile(final int idx, final String nickname, final int age, final int gender, final PersonalityType personalityType
, final String introduce, final String mainImg, final String job, final Enum addressCity, final Enum addressDistinct, final int ban) {
this.idx = idx;
this.nickname = nickname;
this.age = age;
this.gender = gender;
this.personality = personalityType;
this.introduce = introduce;
this.mainImg = mainImg;
this.job = job;
this.addressCity = addressCity;
this.addressDistinct = addressDistinct;
this.ban = ban;
}
}
28 changes: 28 additions & 0 deletions src/main/java/com/hibit2/hibit2/profile/domain/ProfileImage.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package com.hibit2.hibit2.profile.domain;


import lombok.Getter;

import javax.persistence.*;

@Entity
@Getter
public class ProfileImage {


@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "idx", nullable = false)
private int idx; // 프로필_이미지_IDX

@Column(name = "image_url")
private String imageUrl; // 이미지_URL

protected ProfileImage() {
}

public ProfileImage(int idx, String imageUrl) {
this.idx = idx;
this.imageUrl = imageUrl;
}
}
13 changes: 0 additions & 13 deletions src/test/java/com/hibit2/hibit2/Hibit2ApplicationTests.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package com.hibit2.hibit2.domain.member.domain;

import static org.junit.jupiter.api.Assertions.*;
package com.hibit2.hibit2.member.domain;

import com.hibit2.hibit2.member.domain.Member;
import com.hibit2.hibit2.member.domain.MemberRepository;
import com.hibit2.hibit2.member.domain.Role;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hibit2.hibit2.domain.member.domain;
package com.hibit2.hibit2.member.domain;

import static org.junit.jupiter.api.Assertions.*;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
Expand All @@ -8,9 +8,9 @@
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

import com.hibit2.hibit2.domain.member.domain.Member;
import com.hibit2.hibit2.domain.member.domain.Role;
import com.hibit2.hibit2.domain.member.exception.InvalidMemberException;
import com.hibit2.hibit2.member.domain.Member;
import com.hibit2.hibit2.member.domain.Role;
import com.hibit2.hibit2.member.exception.InvalidMemberException;

class MemberTest {
@DisplayName("회원을 생성한다.")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.hibit2.hibit2.profile.domain;

import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.*;

class ProfileImageTest {

@DisplayName("프로필_이미지를_생성한다.")
@Test
void 프로필_이미지를_생성한다() {
}

}
31 changes: 31 additions & 0 deletions src/test/java/com/hibit2/hibit2/profile/domain/ProfileTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package com.hibit2.hibit2.profile.domain;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;

class ProfileTest {


@DisplayName("프로필을 생성한다.")
@Test
void 프로필을_셩상한다() {
// given
int idx = 1;
String nickname = "fancy";
int age = 28;
int gender = 1;
PersonalityType personalityType = PersonalityType.TYPE_1;
String introduce = "Hi, I'm fancy.";
String mainImg = "profile.jpg";
String job = "Backend";
AddressCity addressCity = AddressCity.NEW_YORK;
AddressDistinct addressDistinct = AddressDistinct.MANHATTAN;
int ban = 1;

// when & then
Assertions.assertDoesNotThrow(() -> new Profile(idx, nickname, age, gender,
personalityType, introduce, mainImg, job, addressCity, addressDistinct, ban));
}

}