Skip to content
Open
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
5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ dependencies {
implementation 'org.apache.commons:commons-lang3:3.12.0'
implementation 'commons-io:commons-io:2.11.0'
implementation 'com.auth0:java-jwt:4.3.0'
implementation 'org.springdoc:springdoc-openapi-starter-common:2.0.2'
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'
implementation 'org.springdoc:springdoc-openapi-starter-common:2.0.4'
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.4'
compileOnly 'org.projectlombok:lombok'
developmentOnly 'org.springframework.boot:spring-boot-devtools'
runtimeOnly 'com.mysql:mysql-connector-j'
Expand Down
Binary file added logs/spring.log.2023-08-30.0.gz
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.sequence.anonymous.security;

import com.google.common.base.Preconditions;
import com.sequence.anonymous.user.domain.Role;
import com.sequence.anonymous.user.domain.user.Role;
import java.io.Serializable;
import java.util.Collection;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.sequence.anonymous.security;

import com.sequence.anonymous.user.domain.Role;
import com.sequence.anonymous.user.domain.user.Role;
import java.util.Map;
import org.springframework.security.oauth2.core.oidc.OidcIdToken;
import org.springframework.security.oauth2.core.oidc.OidcUserInfo;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.sequence.anonymous.security.CustomOAuth2UserInfoFactory;
import com.sequence.anonymous.security.userinfo.CustomOAuth2UserInfo;
import com.sequence.anonymous.user.domain.OAuth2Provider;
import com.sequence.anonymous.user.domain.User;
import com.sequence.anonymous.user.domain.user.User;
import com.sequence.anonymous.user.domain.repository.UserRepository;
import java.util.Map;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.sequence.anonymous.security.CustomOidcUser;
import com.sequence.anonymous.security.userinfo.CustomOAuth2UserInfo;
import com.sequence.anonymous.user.domain.OAuth2Provider;
import com.sequence.anonymous.user.domain.User;
import com.sequence.anonymous.user.domain.user.User;
import com.sequence.anonymous.user.domain.repository.UserRepository;
import java.util.Map;
import lombok.RequiredArgsConstructor;
Expand Down
46 changes: 46 additions & 0 deletions src/main/java/com/sequence/anonymous/user/domain/Attachment.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package com.sequence.anonymous.user.domain;

import com.google.common.base.Preconditions;
import com.sequence.anonymous.user.domain.user.User;
import jakarta.persistence.*;
import lombok.Getter;

@Getter @Entity
public class Attachment {

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

@ManyToOne
@JoinColumn(name = "user_id")
private User user;

private String name;

@Enumerated(EnumType.STRING)
private FileType type;

protected Attachment(){

}

public Attachment(User user, String name, FileType type) {
this.user = user;
this.name = name;
this.type = type;
}

private Attachment(Long id, User user, String name, FileType type){
Preconditions.checkArgument(user != null, "user must be provided");
Preconditions.checkArgument(type != null, "filetype must be provided");

this.id = id;
this.user = user;
this.name = name;
this.type = type;

}


}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.sequence.anonymous.user.domain;

public enum FileType {
MP4, MP3, PNG, JPEG
}
54 changes: 0 additions & 54 deletions src/main/java/com/sequence/anonymous/user/domain/User.java

This file was deleted.

34 changes: 34 additions & 0 deletions src/main/java/com/sequence/anonymous/user/domain/UserRelation.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package com.sequence.anonymous.user.domain;

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

@Entity @Getter
public class UserRelation {

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

private Long user;
private Long relation;

// RelationKind ..?

protected UserRelation(){

}

public UserRelation(Long user, Long relation) {
this.user = user;
this.relation = relation;
}

private UserRelation(Long id, Long user, Long relation){
this.id = id;
this.user = user;
this.relation = relation;
}
}
35 changes: 35 additions & 0 deletions src/main/java/com/sequence/anonymous/user/domain/chat/Chat.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package com.sequence.anonymous.user.domain.chat;

import jakarta.persistence.*;
import lombok.Getter;

import java.util.ArrayList;
import java.util.List;
import java.util.UUID;

@Entity @Getter
public class Chat {

@Id @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "chat_id")
private Long id;

@OneToMany
private List<UserChat> userChat = new ArrayList<>();

@Column
private UUID chatIdentifier;

protected Chat(){

}
public Chat(UUID chatIdentifier) {
this.chatIdentifier = chatIdentifier;
}

private Chat(Long id, UUID chatIdentifier){
this.id = id;
this.chatIdentifier = chatIdentifier;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.sequence.anonymous.user.domain.chat;

import com.sequence.anonymous.user.domain.user.User;
import jakarta.persistence.*;
import lombok.Getter;

@Entity
@Getter
public class UserChat {

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

@ManyToOne
@JoinColumn(name = "user_id")
private User user;

@ManyToOne
@JoinColumn(name = "chat_id")
private Chat chat;

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package com.sequence.anonymous.user.domain.college;

import com.sequence.anonymous.user.domain.user.User;
import jakarta.persistence.*;

import java.util.ArrayList;
import java.util.List;
import lombok.Getter;

@Getter
@Entity
public class College {

@Id @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "college_id")
private static Long id;

@OneToMany
private List<User> user = new ArrayList<>();

@OneToMany
private List<Department> department = new ArrayList<>();

@Column(name = "name")
private String name;

@Column(name = "Locaton")
private String location;


}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package com.sequence.anonymous.user.domain.college;

import com.sequence.anonymous.user.domain.user.User;
import jakarta.persistence.*;
import lombok.Getter;

import java.util.ArrayList;
import java.util.List;

@Getter
@Entity
public class Department {

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

@ManyToOne
@JoinColumn(name = "college_id")
private College college;

@OneToMany
private List<User> user = new ArrayList<>();


private String name;

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package com.sequence.anonymous.user.domain.invite;

import com.sequence.anonymous.user.domain.user.User;
import jakarta.persistence.*;
import lombok.Getter;

@Getter
@Entity
public class Invite {

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

@ManyToOne
@JoinColumn(name = "user_id")
@Column(name = "inviter")
private User inviter;

@ManyToOne
@JoinColumn(name = "user_id")
@Column(name = "invitee")
private User invitee;

@Enumerated(EnumType.STRING)
private InviteStatus status;

@Enumerated(EnumType.STRING)
private InviteKind kind;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.sequence.anonymous.user.domain.invite;

public enum InviteKind {
MATCH_POST, FRIEND
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.sequence.anonymous.user.domain.invite;

public enum InviteStatus {
WAIT, DONE
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package com.sequence.anonymous.user.domain.post;

import jakarta.persistence.*;
import lombok.Getter;

import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;

@Entity
@Getter
public class MatchPost {

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

@OneToMany
private List<UserMatchPost> usermatch_post = new ArrayList<>();

private String title;

private String introdue;

private String appeal;

@Enumerated(EnumType.STRING)
private MatchPostStatus status;

private LocalDateTime createdAt;
private LocalDateTime updatedAt;

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.sequence.anonymous.user.domain.post;

public enum MatchPostStatus {
RECRUIT, DONE
}
Loading