Skip to content

Commit

Permalink
Merge pull request #77 from Team-INSERT/refactor/#75
Browse files Browse the repository at this point in the history
docs 도메인 전체 리팩토링
  • Loading branch information
jacobhboy authored Apr 10, 2024
2 parents 678aaf2 + 017527b commit 7f1cadc
Show file tree
Hide file tree
Showing 63 changed files with 362 additions and 716 deletions.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/bug.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ assignees: ''

---

🐞 Describe

🐞 Describe

✅ Tasks
- [ ] 1.

- [ ]
1.

🙋🏻 할 말
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/feature.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ assignees: ''

✨ Describe


✅ Tasks
- [ ] 1.

- [ ]
1.

🙋🏻 할 말
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/refactore.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ assignees: ''

---

🔨 Describe

🔨 Describe

✅ Tasks
- [ ] 1.

- [ ]
1.

🙋🏻 할 말
26 changes: 13 additions & 13 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'

- name: Grant execute permission for gradlew
run: chmod +x gradlew
- uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'

- name: checkStyle
run: ./gradlew check
- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Build with Gradle
run: ./gradlew build
- name: checkStyle
run: ./gradlew check

- name: Build with Gradle
run: ./gradlew build
2 changes: 1 addition & 1 deletion .github/workflows/sonar_cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
branches:
- master
pull_request:
types: [opened, synchronize, reopened]
types: [ opened, synchronize, reopened ]
jobs:
build:
name: Build and analyze
Expand Down
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
# 부마위키

#### <a href="http://bumawiki.kro.kr" target="_blank">웹사이트 바로가기 : bumawiki.kro.kr</a>

#### <a href="https://instagram.com/bssm.forest" target="_blank">인스타그램 바로가기 : @bssm.wiki</a>

#### <a href="https://github.com/BSSM-BSM" target="_blank">BSM OAuth 바로가기 : github.com/BSSM-BSM</a>

## 부마위키

부마위키는 부산소프트웨어마이스터고등학교의 역사를 기록하는 위키입니다.
학생, 선생님, 사건사고, 동아리 등의 문서에 대해 다룹니다.
교내 학생이라면 누구나 문서를 편집하고 생성할 수 있습니다.
Expand All @@ -23,10 +26,13 @@
## Made By

#### 김호현 - 라떼판다 배포 및 코드 리팩토링, 이미지 업로드 기능 구현

#### 이창보 - 서버 구축 및 주요 기능 구현

#### 권세원, 박우빈 - api 통신 및 클라이언트 화면 구현

### Server Developer

<table>
<tr>
<td align="center">
Expand All @@ -47,6 +53,7 @@
</table>

### Client Developer

<table>
<tr>
<td align="center">
Expand All @@ -67,4 +74,5 @@
</table>

### Thanks.

PS. 부마위키 많이 이용해주세용

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

11 changes: 11 additions & 0 deletions src/main/java/com/project/bumawiki/domain/docs/domain/Docs.java
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
package com.project.bumawiki.domain.docs.domain;

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

import com.project.bumawiki.domain.docs.domain.type.DocsType;
import com.project.bumawiki.domain.docs.domain.type.Status;

import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.OneToMany;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
Expand Down Expand Up @@ -39,6 +43,13 @@ public class Docs {
@Enumerated(EnumType.STRING)
private Status status;

@OneToMany(
mappedBy = "docs",
cascade = CascadeType.REMOVE,
fetch = FetchType.LAZY
)
private List<VersionDocs> versionDocs;

public Docs(String title, int enroll, DocsType docsType) {
this.title = title;
this.enroll = enroll;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class VersionDocs {
private String contents;

@CreatedDate
private LocalDateTime thisVersionCreatedAt;
private LocalDateTime createdAt;

@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "user_id")
Expand Down
Loading

0 comments on commit 7f1cadc

Please sign in to comment.