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

Develop branch #21

Open
wants to merge 134 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
57cb524
test
UCLABgown Jan 14, 2025
427cae5
create product entity
solji-choi Jan 14, 2025
54c2c9d
Merge branch 'develop-branch' of https://github.com/prgrms-be-devcour…
UCLABgown Jan 15, 2025
27afa96
test
UCLABgown Jan 15, 2025
7f97e28
컨트롤러 레포
UCLABgown Jan 15, 2025
f9e43ae
BaseInitData
solji-choi Jan 15, 2025
2819c3c
test
UCLABgown Jan 15, 2025
5de78a6
create product controller test
solji-choi Jan 15, 2025
69b4064
feat: Update BaseInitData for initialization improvements
HSH02 Jan 15, 2025
8442dae
chore(Product & initData) : fetch Product and update BaseInitData
HSH02 Jan 15, 2025
06c5b4e
chore(order) : chanage package and InitData
HSH02 Jan 15, 2025
5707ee8
상품수정 / 상품수정 테스트 케이스 추가 수정
UCLABgown Jan 15, 2025
262939d
Merge branch 'develop-branch' into gown
UCLABgown Jan 15, 2025
79428e9
이상한 글자 삭제
UCLABgown Jan 15, 2025
ca62a14
chore(order): initdata & swagger update
HSH02 Jan 15, 2025
8bac6fe
create items, create & items test case
solji-choi Jan 15, 2025
14b638c
Merge pull request #10 from HSH02/worker-han
HSH02 Jan 15, 2025
52fd05e
feat: modified ApiResponse and OrderController response handling
HSH02 Jan 15, 2025
d638dad
Merge pull request #11 from HSH02/worker-han
HSH02 Jan 15, 2025
7f7bad0
feat: 초기화 데이터 로직 및 주석 추가
HSH02 Jan 15, 2025
83ed76f
Merge pull request #12 from HSH02/worker-han
HSH02 Jan 15, 2025
7722e10
chore(order): create 메서드에서 order 가 아닌 OrderResponseDTO을 반환하게 수정
HSH02 Jan 15, 2025
127ea89
chore(order): create 메서드에서 order 가 아닌 OrderResponseDTO을 반환하게 수정
HSH02 Jan 15, 2025
a910f22
product item, delete
solji-choi Jan 15, 2025
ea4bdfb
refactoring, test case 추가
solji-choi Jan 15, 2025
c30884d
test: 주문 통합 테스트 작성
Jan 15, 2025
54105be
test: 주문 통합 테스트 작성
Jan 15, 2025
0a20c58
Merge branch 'develop-branch' of https://github.com/prgrms-be-devcour…
HSH02 Jan 16, 2025
a79e644
feat(order): 스케줄러 기능 추가 및 Entity 어노테이션 수정
HSH02 Jan 16, 2025
b822934
Merge branch 'worker-han' of https://github.com/HSH02/NBE3-4-1-16Team…
HSH02 Jan 16, 2025
a9fd240
refactor: price type change
solji-choi Jan 16, 2025
9ef4bec
feat: made schema
solji-choi Jan 16, 2025
8e63dc0
feat(order):
HSH02 Jan 16, 2025
b051ac1
feat: next.js install
solji-choi Jan 16, 2025
52410c1
Merge pull request #15 from HSH02/worker-han
HSH02 Jan 16, 2025
b32661a
feat: create admin
solji-choi Jan 16, 2025
505dc07
Merge remote-tracking branch 'upstream/develop-branch' into worker-han
HSH02 Jan 16, 2025
aab7281
feat: install openapi-fetch, creat admin list
solji-choi Jan 16, 2025
114ce30
feat: list image
solji-choi Jan 16, 2025
a0ef1da
Merge remote-tracking branch 'upstream/feat-front-product' into worke…
HSH02 Jan 16, 2025
efb05b0
feat: create createPage
solji-choi Jan 16, 2025
6d4a6d7
feat: list page 작업중
solji-choi Jan 16, 2025
d66503e
test: 주문 테스트 코드 보완 작성
sete3683 Jan 16, 2025
b077272
Merge remote-tracking branch 'upstream/feat-front-product' into worke…
HSH02 Jan 16, 2025
fe4afea
Merge remote-tracking branch 'upstream/feature/order' into feature/fr…
HSH02 Jan 16, 2025
7529473
feat(order):
HSH02 Jan 16, 2025
fdb074b
feat(order) : add test next.js about order
HSH02 Jan 16, 2025
d7def38
fix: remove api-docs.json from repository
HSH02 Jan 16, 2025
856476d
feat: style 완료
solji-choi Jan 16, 2025
5b3e451
feat: user product list style, refactor: layout
solji-choi Jan 16, 2025
b9eef1a
refactor: font change
solji-choi Jan 16, 2025
cfc4900
Merge remote-tracking branch 'upstream/feat-front-product' into worke…
HSH02 Jan 17, 2025
264b6bf
프론트:제품생성 추가 / cors를 해결하기 위해 appconfig webconfig추가
UCLABgown Jan 17, 2025
018fc26
Merge remote-tracking branch 'upstream/feat-front-product' into worke…
HSH02 Jan 17, 2025
a7c6845
feat(order): add default page about order and fix next.js order / cas…
HSH02 Jan 17, 2025
2e7c325
Merge pull request #18 from HSH02/worker-han
HSH02 Jan 17, 2025
137aea5
feat: admin products list 완료
solji-choi Jan 17, 2025
57b2dc6
feat(order) : add front order create templeate
HSH02 Jan 17, 2025
9e3b139
feat(order) : add category to order create templeate
HSH02 Jan 17, 2025
f594967
수정 페이지
UCLABgown Jan 17, 2025
775eaf3
Merge branch 'feat-front-product' of https://github.com/prgrms-be-dev…
UCLABgown Jan 17, 2025
d6c48b5
/amdin/products에서 admin//products/modify 파라미터값 값받아올수있게수정
UCLABgown Jan 17, 2025
9f86e6b
refactor: modify ì, create
solji-choi Jan 17, 2025
9aa5e77
modify.client:빈 이미지 주소가 노출되는 문제해결 / modify 강사님코드 처럼 고침
UCLABgown Jan 17, 2025
aa958bb
add(order) : add cart template page of order and update style to clas…
HSH02 Jan 17, 2025
75cfab8
Merge remote-tracking branch 'upstream/feat-front-product' into worke…
HSH02 Jan 17, 2025
8e4e891
feat: 주문 조회 기능 추가
sete3683 Jan 17, 2025
96163a1
Merge remote-tracking branch 'upstream/feature/front-order' into work…
HSH02 Jan 17, 2025
fb8b7eb
fixed: 충돌 해결
sete3683 Jan 17, 2025
b30ea53
feat(order) : add CREATE ORDER feature in ClientPage
HSH02 Jan 17, 2025
eb886d5
Merge remote-tracking branch 'upstream/feature/front-order' into work…
HSH02 Jan 17, 2025
9b77e90
파일 업로드 기능 구현 / axios이용후/admin/products의 format(new Date(item.createDa…
UCLABgown Jan 18, 2025
a558bb6
feat(order) : add feature cart of order
HSH02 Jan 19, 2025
0554fa7
Merge remote-tracking branch 'upstream/feat-front-product' into worke…
HSH02 Jan 19, 2025
0546c0f
feat: 주문 내역 페이징 및 출력 내용 추가
sete3683 Jan 19, 2025
5640061
feat: 어드민 페이지 주문 조회 기능 추가
sete3683 Jan 19, 2025
7275436
Merge remote-tracking branch 'upstream/feature/front-order' into work…
HSH02 Jan 20, 2025
06610a4
chore(order) : delete test data page about order
HSH02 Jan 20, 2025
82e01bb
/damin/products Date인식문제해결 /damin/products/modify[id] 이미지 미수정시 없는거로 인…
UCLABgown Jan 20, 2025
d510b55
mvcConfiguration추가
UCLABgown Jan 20, 2025
56fb5e8
feat(order) : add delete feature of cart and refactor cart & create page
HSH02 Jan 20, 2025
5b61f5e
이미지 파일 선택시 바로 업로드되게 수정 / 백엔드 이미지 에러 수정
UCLABgown Jan 20, 2025
8d2249e
지원하지않는 파일형식시 오류출력
UCLABgown Jan 20, 2025
f85b105
feat: search, paging (backend)
solji-choi Jan 20, 2025
430ec79
Merge branch 'feat-front-product' of https://github.com/prgrms-be-dev…
solji-choi Jan 20, 2025
cc34e04
feat(order): modify about alert
HSH02 Jan 20, 2025
3ba99ed
ProductService 충돌 해결
solji-choi Jan 20, 2025
bfed8f8
fix: product create 오류 수정
solji-choi Jan 20, 2025
7f7e91e
카테고리 선택기능 추가
UCLABgown Jan 20, 2025
dce5e27
feat: search, paging (frontend)
solji-choi Jan 20, 2025
13dd771
feat: 관리자 페이지 주문 수정 기능 추가
sete3683 Jan 20, 2025
55d654a
feat(order): modify main package
HSH02 Jan 20, 2025
750321e
create 카테고리선택 / 일부 오류 수정
UCLABgown Jan 20, 2025
fca2333
feat: category 서버에서 불러오도록
solji-choi Jan 20, 2025
74f8806
fix: 오류 수정
solji-choi Jan 20, 2025
3e9705b
fix: main list 안나오는 문제 수정
solji-choi Jan 20, 2025
2321f03
이미지 폴더 없던거 추가
UCLABgown Jan 20, 2025
cf9f682
chore(order): delete user package
HSH02 Jan 20, 2025
46ec6a9
다른 환경일시 이미지 등록안되는 문제해결
UCLABgown Jan 20, 2025
a0341bd
카테고리 onChange문제로 첫번째 항목 수정안되는거 해결
UCLABgown Jan 20, 2025
6411f3d
카테고리 안바뀌는거 수정
UCLABgown Jan 20, 2025
19401ff
Merge branch 'feat-front-product' into develop-branch
UCLABgown Jan 20, 2025
773fe24
fixed: front-order 브랜치와의 충돌 해결
sete3683 Jan 20, 2025
80bfcc4
fixed: 시간 출력 버그 해결
sete3683 Jan 20, 2025
dbee5f0
feat: admin login
solji-choi Jan 17, 2025
834472c
test: login 실패 테스트 추가
solji-choi Jan 17, 2025
000132a
feat: spring secutiry 적용
solji-choi Jan 17, 2025
cbe94f2
feat: jwt 적용
solji-choi Jan 17, 2025
9209a4d
feat: create login page(front)
solji-choi Jan 18, 2025
6b59099
feat: cookie 기능 추가
solji-choi Jan 18, 2025
c00946f
feat: 인가(backend)
solji-choi Jan 18, 2025
76147a1
feat: logout 기능 구현(front)
solji-choi Jan 18, 2025
8bc8bcd
feat: 인가(frontend)
solji-choi Jan 19, 2025
48bfc8d
fix: 오류수정, admin 메뉴 링크 수정
solji-choi Jan 20, 2025
0e4a812
fix: 주문 등록 권한 수정
solji-choi Jan 20, 2025
374ca0d
chore(order) : 테TDD 테스트 order 작동하도ë록 수정
HSH02 Jan 20, 2025
f8c2c5d
feat: main list style
solji-choi Jan 20, 2025
70f7ea3
오전/오후 문제해결 / os별 이미지 저장경로 수정 / 주문시 권한문제 해결
UCLABgown Jan 20, 2025
562ba34
Merge branch 'develop-branch' of https://github.com/prgrms-be-devcour…
UCLABgown Jan 20, 2025
e58bdcf
feat: main list style2
solji-choi Jan 20, 2025
e9f022f
feat: main list style
solji-choi Jan 20, 2025
55fb3ee
feat: main list style2
solji-choi Jan 20, 2025
1c7aefc
Merge branch 'feat/style' of https://github.com/prgrms-be-devcourse/N…
solji-choi Jan 20, 2025
a10d763
feat: cart style
solji-choi Jan 20, 2025
5328dc5
feat: cart style2, order list style
solji-choi Jan 20, 2025
32d2f9f
feat: order list style2, Order Details style
solji-choi Jan 20, 2025
0b9c8e4
feat: admin products form style
solji-choi Jan 20, 2025
97135dd
feat: admin order list style
solji-choi Jan 20, 2025
c13bfc7
feat: admin order detail style
solji-choi Jan 20, 2025
762b64d
fix: /admin 페이지에 admin일 경우 /admin/products 로 리다이렉트, 로그인 페이지에서 로그아웃 버튼 숨김
solji-choi Jan 21, 2025
d93d893
mac에서 /Users/ 아래에 저장안되는것같으니 /Users/[사용자이름]으로 수정 (안될수있음)
UCLABgown Jan 21, 2025
aea07cb
fix: servlet error fix
solji-choi Jan 21, 2025
031a6e8
/admin/products/ClientPage Date 받는형식수정
UCLABgown Jan 21, 2025
c968703
fixed: 날짜 출력 오류 수정 및 상태 변경 기능 수정
sete3683 Jan 21, 2025
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
Prev Previous commit
Next Next commit
create product entity
solji-choi authored and UCLABgown committed Jan 15, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 427cae58cc56b7db9d93315ee2bf0c9381963670
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -35,3 +35,7 @@ out/

### VS Code ###
.vscode/

### Custom ###
db_dev.mv.db
db_dev.trace.db
4 changes: 2 additions & 2 deletions backend/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -25,15 +25,15 @@ repositories {

dependencies {
implementation("org.springframework.boot:spring-boot-starter-data-jpa")
implementation("org.springframework.boot:spring-boot-starter-security")
//implementation("org.springframework.boot:spring-boot-starter-security")
implementation("org.springframework.boot:spring-boot-starter-validation")
implementation("org.springframework.boot:spring-boot-starter-web")
compileOnly("org.projectlombok:lombok")
developmentOnly("org.springframework.boot:spring-boot-devtools")
runtimeOnly("com.h2database:h2")
annotationProcessor("org.projectlombok:lombok")
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("org.springframework.security:spring-security-test")
//testImplementation("org.springframework.security:spring-security-test")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;

@SpringBootApplication
@EnableJpaAuditing
public class SpringProject1Application {

public static void main(String[] args) {

SpringApplication.run(SpringProject1Application.class, args);

System.out.println("테스트");
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package team16.spring_project1.domain.product.product.entity;

import jakarta.persistence.Entity;
import lombok.*;
import team16.spring_project1.global.jpa.entity.BaseTime;

@Entity
@Getter
@Setter
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class Product extends BaseTime {
private String productName;
private int price;
private String imageUrl;
private String category;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package team16.spring_project1.global.jpa.entity;

import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.MappedSuperclass;
import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;

import static jakarta.persistence.GenerationType.IDENTITY;

@Getter
@EqualsAndHashCode(onlyExplicitlyIncluded = true)
@MappedSuperclass
public class BaseEntity {
@Id
@GeneratedValue(strategy = IDENTITY) // AUTO_INCREMENT
@Setter(AccessLevel.PROTECTED)
@EqualsAndHashCode.Include
private Long id;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package team16.spring_project1.global.jpa.entity;

import jakarta.persistence.EntityListeners;
import jakarta.persistence.MappedSuperclass;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;

import java.time.LocalDateTime;

@Getter
@EntityListeners(AuditingEntityListener.class)
@MappedSuperclass
public class BaseTime extends BaseEntity {
@CreatedDate
@Setter(AccessLevel.PRIVATE)
private LocalDateTime createDate;

@LastModifiedDate
@Setter(AccessLevel.PRIVATE)
private LocalDateTime modifyDate;
}
Empty file.
3 changes: 3 additions & 0 deletions backend/src/main/resources/application-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
spring:
datasource:
url: jdbc:h2:mem:db_test;MODE=MySQL
1 change: 0 additions & 1 deletion backend/src/main/resources/application.properties

This file was deleted.

46 changes: 46 additions & 0 deletions backend/src/main/resources/application.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
server:
port: 8080
spring:
application:
name: spring_project1
profiles:
active: dev
web:
resources:
add-mappings: false
output:
ansi:
enabled: always
jackson:
serialization:
fail-on-empty-beans: false
datasource:
url: jdbc:h2:./db_dev;MODE=MySQL
username: sa
password:
driver-class-name: org.h2.Driver
hikari:
auto-commit: false
jpa:
open-in-view: false
hibernate:
ddl-auto: update
properties:
hibernate:
default_batch_fetch_size: 100
format_sql: true
highlight_sql: true
use_sql_comments: true
springdoc:
default-produces-media-type: application/json;charset=UTF-8
logging:
level:
org.hibernate.SQL: DEBUG
org.hibernate.orm.jdbc.bind: TRACE
org.hibernate.orm.jdbc.extract: TRACE
org.springframework.transaction.interceptor: TRACE
custom:
jwt:
secretKey: abcdefghijklmnopqrstuvwxyz1234567890abcdefghijklmnopqrstuvwxyz1234567890
accessToken:
expirationSeconds: "#{60*20}"
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
rootProject.name = "spring-project1"
rootProject.name = "NBE3-4-1-16Team"
include("backend")
include("frontend")