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

Feature/#1 초기세팅 #2

Merged
merged 4 commits into from
Jun 3, 2023
Merged
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
22 changes: 22 additions & 0 deletions .github/.gitmessage.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@


# #이슈번호 [커밋타입] : 내용
# [Feat] : 새로운 기능 구현
# [Fix] : 버그, 오류 해결, 코드 수정
# [Design] : just 화면. 레이아웃 조정
# [Merge] : 머지, 충돌 해결
# [Refactor] : 프로덕션 코드 리팩토링
# [Comment] : 필요한 주석 추가 및 변경
# [Docs] : README나 WIKI 등의 문서 개정
# [Chore] : 빌드 태스트 업데이트, 패키지 매니저를 설정하는 경우(프로덕션 코드 변경 X)
# [Setting] : 초기 세팅
# [Rename] : 파일 혹은 폴더명을 수정하거나 옮기는 작업만인 경우
# [Remove] : 파일 혹은 폴더명을 수정하거나 옮기는 작업만인 경우

# [커밋 타입] : 설명!!


# Commit Example!!
# [Feat]#1 - ~~기능 추가!
#
# 설명을 덧붙이고 싶다면 이 예시처럼 위에 commit 메세지와 한 칸 띄고 작성하면 돼용 <바디에 들어감>
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
## 🎱 이슈 요약

<!-- 이슈에 대해 설명해주세요. -->
- 프로젝트 초기 세팅

## ✅ 체크 리스트

<!-- 해야 할 일을 적어주세요. -->

- [ ] 프로젝트 초기 세팅
11 changes: 11 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
## 🎱 작업한 내용

<!-- 아래 리스트를 지우고, 작업 내용을 적어주세요. -->
- 작업 내용 2

## ❗️ PR POINT
<!-- 덧붙이고 싶은 내용이 있다면! -->

## 🌈 관련 이슈
<!-- 작업한 이슈번호를 # 뒤에 붙여주세요. 수고했습니다~* -->
- Resolved: #
15 changes: 14 additions & 1 deletion was/src/main/java/qdang/group/was/match/domain/Match.java
Original file line number Diff line number Diff line change
@@ -1,2 +1,15 @@
package qdang.group.was.match.domain;public class Match {
package qdang.group.was.match.domain;


import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import lombok.Getter;

@Getter
@Entity
public class Match {

@Id
private Long id;

}
Original file line number Diff line number Diff line change
@@ -1,2 +1,13 @@
package qdang.group.was.matchProcess.domain;public class MatchProcess {
package qdang.group.was.matchProcess.domain;

import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import lombok.Getter;

@Getter
@Entity
public class MatchProcess {

@Id
private Long id;
}
Original file line number Diff line number Diff line change
@@ -1,2 +1,14 @@
package qdang.group.was.phoneAuth.domain;public class PhoneAuth {
package qdang.group.was.phoneAuth.domain;


import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import lombok.Getter;

@Getter
@Entity
public class PhoneAuth {

@Id
private Long id;
}
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
package qdang.group.was.user.controller;public class UserController {
package qdang.group.was.user.controller;

public class UserController {
}
41 changes: 39 additions & 2 deletions was/src/main/java/qdang/group/was/user/domain/User.java
Original file line number Diff line number Diff line change
@@ -1,2 +1,39 @@
package qdang.group.was.user.domain;public class User {
}
package qdang.group.was.user.domain;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import lombok.Getter;

@Getter
@Entity
public class User {

@Id
@Column(name = "USER_ID")
private Long id;

private String username;
private String phone;
private String password;
private String accessToken;
private String fcmToken;
private String profileImage;
private String birthday;
private String gender;
private String address;
private String detailAddress;
private String joinStaff;
private String restingTf;
private String leaveTf;
private String phoneAuthCode;
private String phoneAuthAt;
private String phoneAuthSuccess;
private String phoneAuthTf;
private String joinAt;
private String joinPermitUserId;
private String joinAgree;
private String agreeUpdateAt;
private String accessAt;
private String accessCount;
}
Original file line number Diff line number Diff line change
@@ -1,2 +1,14 @@
package qdang.group.was.userMatch.domain;public class UserMatch {
package qdang.group.was.userMatch.domain;

import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import lombok.Getter;

@Getter
@Entity
public class UserMatch {

@Id
private Long id;

}
Original file line number Diff line number Diff line change
@@ -1,2 +1,14 @@
package qdang.group.was.userMatchProcess.domain;public class UserMatchProcess {
package qdang.group.was.userMatchProcess.domain;

import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import lombok.Getter;

@Getter
@Entity
public class UserMatchProcess {

@Id
private Long id;

}