Skip to content

Commit

Permalink
Merge pull request #46 from dd-jiyun/main
Browse files Browse the repository at this point in the history
์งˆ๋ฌธ ๊ฒŒ์‹œํŒ (#20)
  • Loading branch information
dd-jiyun authored Feb 13, 2024
2 parents 067afd5 + 39bca4b commit ff14d5d
Show file tree
Hide file tree
Showing 6 changed files with 59 additions and 8 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.example.titto_backend.questionBoard.domain;

public enum Department {
HUMANITIES, // ์ธ๋ฌธ
MANAGEMANT, // ๊ฒฝ์˜
SOCIETY, // ์‚ฌํšŒ
MEDIA_CONTENT, // ๋ฏธ๋””์–ด ์ฝ˜ํ…์ธ 
FUTURE_FUSION, // ๋ฏธ๋ž˜์œตํ•ฉ
SOFEWARE // ์†Œํ”„ํŠธ์›จ์–ด
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package com.example.titto_backend.questionBoard.domain;

import com.example.titto_backend.common.BaseEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;

@Entity
@Table(name = "questionPosts")
@AllArgsConstructor
@NoArgsConstructor
public class QuestionPost extends BaseEntity {

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

@Enumerated(EnumType.STRING)
@Column(name = "department")
private Department department;

@Column(name = "question_title", nullable = false)
private String title;

@Column(name = "question_content", nullable = false, columnDefinition = "TEXT")
private String content;

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

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.example.titto_backend.questionBoard.domain;

public enum Status {
SOLVED, // ํ•ด๊ฒฐ๋จ
UNSOLVED // ํ•ด๊ฒฐ๋˜์ง€ ์•Š์Œ
}
4 changes: 2 additions & 2 deletions Titto_Backend/src/main/resources/application-oauth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ oauth:
kakao:
client-id: ${KAKAO_CLIENT_ID}
client-secret: ${KAKAO_CLIENT_SECRET}
redirect-uri: "http://localhost:8080/login/oauth2/code/kakao"
redirect-uri: ${KAKAO_REDIRECT_URI}

naver:
client-id: ${NAVER_CLIENT_ID}
client-secret: ${NAVER_CLIENT_SECRET}
redirect-uri: "http://localhost:8080/login/oauth2/code/naver"
redirect-uri: ${NAVER_REDIRECT_URI}
5 changes: 0 additions & 5 deletions Titto_Backend/src/main/resources/application-production.yml

This file was deleted.

3 changes: 2 additions & 1 deletion Titto_Backend/src/main/resources/application.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
spring:
profiles:
active: local
include: oauth, production
include: oauth

# DB
datasource:
url: ${DB_JDBC_URL}
Expand Down

0 comments on commit ff14d5d

Please sign in to comment.