Skip to content

Commit

Permalink
Merge pull request #22 from dnd-side-project/Feature/#21
Browse files Browse the repository at this point in the history
Feature/#21: ERD 변경 및 JpaRepository 구성
  • Loading branch information
abc5259 authored Jul 30, 2024
2 parents 664d594 + 7a9161a commit 70f65cb
Show file tree
Hide file tree
Showing 20 changed files with 94 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import org.springframework.boot.autoconfigure.SpringBootApplication;

@SpringBootApplication
public class DndphotoApplication {
public class SnappyApplication {

public static void main(String[] args) {
SpringApplication.run(DndphotoApplication.class, args);
SpringApplication.run(SnappyApplication.class, args);
}

}
1 change: 1 addition & 0 deletions src/main/java/com/dnd/snappy/domain/common/BaseEntity.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import jakarta.persistence.MappedSuperclass;
import java.time.LocalDateTime;
import lombok.Getter;
import lombok.experimental.SuperBuilder;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/com/dnd/snappy/domain/meeting/entity/Meeting.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,15 @@
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import java.time.LocalDateTime;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;

@Getter
@Entity
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@SuperBuilder(toBuilder = true)
public class Meeting extends BaseEntity {

@Column(nullable = false)
Expand All @@ -31,4 +38,7 @@ public class Meeting extends BaseEntity {

@Column(nullable = false)
private String adminPassword;

@Column(nullable = false)
private String meetingLink;
}
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.dnd.snappy.domain.meeting.repository;

import com.dnd.snappy.domain.meeting.entity.Meeting;
import org.springframework.data.jpa.repository.JpaRepository;

public interface MeetingRepository extends JpaRepository<Meeting, Long> {
}
7 changes: 7 additions & 0 deletions src/main/java/com/dnd/snappy/domain/member/entity/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,15 @@

import com.dnd.snappy.domain.common.BaseEntity;
import jakarta.persistence.Entity;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;

@Getter
@Entity
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@SuperBuilder(toBuilder = true)
public class Member extends BaseEntity {

}
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,30 @@
import com.dnd.snappy.domain.common.BaseEntity;
import com.dnd.snappy.domain.meeting.entity.Meeting;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.FetchType;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;

@Entity
@Getter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@SuperBuilder(toBuilder = true)
public class MemberMeeting extends BaseEntity {

@Column(nullable = false)
private String nickname;

@Column(nullable = false)
@Enumerated(EnumType.STRING)
private Role role;

@Column(nullable = false)
private Integer shootCount;

Expand All @@ -22,4 +37,5 @@ public class MemberMeeting extends BaseEntity {
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "meeting_id")
private Meeting meeting;

}
5 changes: 5 additions & 0 deletions src/main/java/com/dnd/snappy/domain/member/entity/Role.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.dnd.snappy.domain.member.entity;

public enum Role {
ORGANIZER, PARTICIPANT
}
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.dnd.snappy.domain.member.repository;

import com.dnd.snappy.domain.member.entity.MemberMeeting;
import org.springframework.data.jpa.repository.JpaRepository;

public interface MemberMeetingRepository extends JpaRepository<MemberMeeting, Long> {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.dnd.snappy.domain.member.repository;

import com.dnd.snappy.domain.member.entity.Member;
import org.springframework.data.jpa.repository.JpaRepository;

public interface MemberRepository extends JpaRepository<Member, Long> {
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,15 @@
import jakarta.persistence.FetchType;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;

@Entity
@Getter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@SuperBuilder(toBuilder = true)
public class Mission extends BaseEntity {

private String content;
Expand Down
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.dnd.snappy.domain.mission.repository;

import com.dnd.snappy.domain.mission.entity.Mission;
import org.springframework.data.jpa.repository.JpaRepository;

public interface MissionRepository extends JpaRepository<Mission, Long> {
}
7 changes: 7 additions & 0 deletions src/main/java/com/dnd/snappy/domain/photo/entity/Photo.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,15 @@
import jakarta.persistence.FetchType;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;

@Entity
@Getter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@SuperBuilder(toBuilder = true)
public class Photo extends BaseEntity {

@Column(name = "photo_url")
Expand Down
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.dnd.snappy.domain.photo.repository;

import com.dnd.snappy.domain.photo.entity.Photo;
import org.springframework.data.jpa.repository.JpaRepository;

public interface PhotoRepository extends JpaRepository<Photo, Long> {
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.dnd.dndphoto;
package com.dnd.snappy;

import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;

@SpringBootTest
class DndphotoApplicationTests {
class SnappyApplicationTests {

@Test
void contextLoads() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dnd.dndphoto.config;
package com.dnd.snappy.config;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.restdocs.RestDocumentationContextProvider;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.dnd.dndphoto.config;
package com.dnd.snappy.config;

import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.context.annotation.Bean;
Expand Down

0 comments on commit 70f65cb

Please sign in to comment.