Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
7d98206
Create README.md
OneK-2 Jan 21, 2023
810b946
Create submission
OneK-2 Jan 21, 2023
0d6316f
Delete submission
OneK-2 Jan 21, 2023
9d9d768
Update README.md
OneK-2 Jan 26, 2023
6dd36f3
refactor: 스프링부트, 자바 버전 변경
OneK-2 Jan 28, 2023
919d5d3
Update README.md
OneK-2 Jan 28, 2023
a1a16c3
refactor: yml로 변경
OneK-2 Jan 29, 2023
73f98e9
feat: jwt 관련 설정 추가
OneK-2 Jan 29, 2023
d8c32ae
feat: DB, jpa, jwt설정
OneK-2 Jan 29, 2023
dedd721
feat: erd바탕으로 엔티티구현
OneK-2 Jan 29, 2023
c6d6bda
feat: jwt 구현
OneK-2 Jan 29, 2023
fa545ff
feat: 기본 유저 서비스, 컨트롤러
OneK-2 Jan 29, 2023
8213894
Update README.md
OneK-2 Feb 1, 2023
9de73e4
feat: 생성시간, 수정시간 반영 위한 BaseTimeEntity 추가
OneK-2 Feb 5, 2023
be9261a
refactor: validation 위한 설정 추가
OneK-2 Feb 5, 2023
9f19d07
refactor: 카테고리를 enum으로 변경
OneK-2 Feb 5, 2023
a2365fc
refactor: role 이름 변경
OneK-2 Feb 5, 2023
f23049c
refactor: login 기능 리펙토링, 회원가입 기능 추가
OneK-2 Feb 5, 2023
af99cdd
feat: 시간설정추가, 상태, 카테고리 추가
OneK-2 Feb 5, 2023
98544b9
feat: ProductRepository 생성
OneK-2 Feb 5, 2023
9e5c260
feat: ProductService 생성
OneK-2 Feb 5, 2023
2fd386c
feat: ProductStatus 생성
OneK-2 Feb 5, 2023
c78c58d
feat: db 데이터 저장용 클래스
OneK-2 Feb 5, 2023
ef784f3
Update README.md
OneK-2 Feb 5, 2023
e142ece
feat: ProductController 추가
OneK-2 Feb 12, 2023
0356437
refactor: findUser 메소드 추가
OneK-2 Feb 12, 2023
f934bac
feat: 상품 등록 DTO 추가
OneK-2 Feb 12, 2023
048b279
refactor: 상품 등록 기능 추가
OneK-2 Feb 12, 2023
3e04d6a
refactor: builder 추가
OneK-2 Feb 12, 2023
a6e26b8
refactor: Like 연관관계 추가
OneK-2 Feb 12, 2023
08a0b88
feat: Like 구현
OneK-2 Feb 12, 2023
19a7163
feat: LikeController 추가
OneK-2 Feb 12, 2023
0f53c10
feat: LikeService 추가
OneK-2 Feb 12, 2023
ffea9ed
refactor: 전체 상품 조회
OneK-2 Feb 12, 2023
4f72169
feat: 상품조회 DTO 추가
OneK-2 Feb 13, 2023
d883f2a
feat: 상품조회 위한 메서드 추가
OneK-2 Feb 13, 2023
2ee851e
feat: 상품조회 기능 추가
OneK-2 Feb 13, 2023
62a1352
feat: LikeRepository 추가
OneK-2 Feb 14, 2023
37328ef
feat: 좋아요 등록, 삭제 기능 추가
OneK-2 Feb 14, 2023
0e88e81
refactor: Likes로 엔티티명 변경
OneK-2 Feb 14, 2023
e900d2b
Update README.md
OneK-2 Feb 16, 2023
0ae9bb5
feat: 유저 프로필 변경 위한 DTO생성
OneK-2 Feb 16, 2023
dc7b011
feat: 유저 프로필 변경 기능 추가
OneK-2 Feb 16, 2023
fddefc0
Update README.md
OneK-2 Feb 16, 2023
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
48 changes: 48 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# Spring-JPA-study
D-Coding 백엔드 스터디

## 1주차 과제 제출(23-01-21)
스프링 입문 강의 정리

## 2~4주차 과제
- 간단한 ‘당근마켓’ 벡엔드 구현해보기
### 요구 사항

- 회원가입/로그인 기능
- 상품등록 기능
- 상품페이지 기능
- 마이 페이지(나의 당근 페이지) 기능

### 제한 사항

- Spring 또는 Spring Boot Framework를 사용해야합니다.
- JPA를 사용해야합니다. (Spring data jpa 활용 가능)
- 인증/인가 방식은 JWT & Spring Security 를 활용해야합니다.

### 2주차

- 요구사항대로 당근마켓 ERD 그려보기
- 요구사항 API 구현 (가능한 만큼)
- jwt, security 이용하여 로그인, 회원가입 기능 구현


![dcoding-erd](https://user-images.githubusercontent.com/85729858/215239770-a2ac0b3a-cd5b-443d-b7a3-d026ce9ae5c5.png)


### 3주차

- 피드백 반영하여 카테고리를 enum으로 처리하도록 하고, createdDate와 updatedDate추가
- 로그인 기능 리펙토링
- 회원가입 기능 추가
- 상품 관련 엔티티, 레포지토리, 서비스 추가
- 상태, 카테고리 enum추가

![image](https://user-images.githubusercontent.com/85729858/216071539-42dc3af6-452e-464f-9a68-c52364c5fc3f.png)


### 4주차

- 상품등록 기능 구현
- 상품조회 기능 구현
- 좋아요 등록, 삭제 기능 구현
- 유저 프로필 수정 기능 추가
13 changes: 11 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
plugins {
id 'java'
id 'org.springframework.boot' version '3.0.1'
id 'org.springframework.boot' version '2.7.8'
id 'io.spring.dependency-management' version '1.1.0'
}

group = 'com.dku'
version = '0.0.1-SNAPSHOT'
sourceCompatibility = '17'
sourceCompatibility = '11'

configurations {
compileOnly {
Expand All @@ -27,6 +27,15 @@ dependencies {
annotationProcessor 'org.projectlombok:lombok'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.security:spring-security-test'

runtimeOnly 'com.h2database:h2'
//implementation 'com.auth0:java-jwt:3.18.2'
// jwt
implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
implementation 'io.jsonwebtoken:jjwt-impl:0.11.5'
implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5'

implementation 'org.springframework.boot:spring-boot-starter-validation'
}

tasks.named('test') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

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

@EnableJpaAuditing
@SpringBootApplication
public class SpringStudyApplication {

Expand Down
46 changes: 46 additions & 0 deletions src/main/java/com/dku/springstudy/config/SecurityConfig.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package com.dku.springstudy.config;

import com.dku.springstudy.jwt.JwtAuthenticationFilter;
import com.dku.springstudy.jwt.JwtTokenProvider;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.http.SessionCreationPolicy;

import org.springframework.security.crypto.factory.PasswordEncoderFactories;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;


@Configuration
@EnableWebSecurity
@RequiredArgsConstructor
public class SecurityConfig {
private final JwtTokenProvider jwtTokenProvider;

@Bean
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
http
.httpBasic().disable()
.formLogin().disable()
.csrf().disable()
.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS)
.and()
.authorizeRequests()
.antMatchers("/api/v1/**").permitAll()
//.antMatchers("/api/v1/").hasRole("USER")
//.anyRequest().authenticated()
.anyRequest().permitAll()
.and()
.addFilterBefore(new JwtAuthenticationFilter(jwtTokenProvider), UsernamePasswordAuthenticationFilter.class);
return http.build();
}

@Bean
public PasswordEncoder passwordEncoder() {
return PasswordEncoderFactories.createDelegatingPasswordEncoder();
}
}
23 changes: 23 additions & 0 deletions src/main/java/com/dku/springstudy/domain/BaseTimeEntity.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.dku.springstudy.domain;

import lombok.Getter;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;

import javax.persistence.Column;
import javax.persistence.EntityListeners;
import javax.persistence.MappedSuperclass;
import java.time.LocalDateTime;

@EntityListeners(AuditingEntityListener.class)
@MappedSuperclass
@Getter
public class BaseTimeEntity {
@CreatedDate
@Column(updatable = false)
private LocalDateTime createdDate;

@LastModifiedDate
private LocalDateTime lastModifiedDate;
}
36 changes: 36 additions & 0 deletions src/main/java/com/dku/springstudy/domain/like/Likes.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package com.dku.springstudy.domain.like;

import com.dku.springstudy.domain.BaseTimeEntity;
import com.dku.springstudy.domain.product.Product;
import com.dku.springstudy.domain.user.User;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

import javax.persistence.*;

@Entity
@NoArgsConstructor
@Getter
public class Likes extends BaseTimeEntity {
@Id
@GeneratedValue
private Long id;
private Long productInfo;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "user_id")
private User user;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "product_id")
private Product product;

@Builder
public Likes(Long productInfo, User user, Product product) {
this.productInfo = productInfo;
this.user = user;
this.product = product;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package com.dku.springstudy.domain.like.controller;

import com.dku.springstudy.domain.like.Likes;
import com.dku.springstudy.domain.like.service.LikeService;
import com.dku.springstudy.domain.product.Product;
import com.dku.springstudy.domain.product.service.ProductService;
import com.dku.springstudy.domain.user.User;
import com.dku.springstudy.domain.user.service.UserService;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.web.bind.annotation.*;

@RestController
@RequiredArgsConstructor
@RequestMapping("/api/v1/like")
public class LikeController {
private final LikeService likeService;
private final UserService userService;
private final ProductService productService;

@PostMapping("/{productId}/addLike")
public ResponseEntity<?> addLike(@AuthenticationPrincipal UserDetails userDetails,
@PathVariable("productId") Long productId) {
User user = userService.findUser(userDetails.getUsername());
Product product = productService.findProduct(productId);

likeService.addLike(new Likes(productId, user, product));
productService.addLikeCount(product);

return ResponseEntity.status(HttpStatus.OK).body("success");
}

@DeleteMapping("/{productId}/deleteLike")
public ResponseEntity<?> deleteLike(@AuthenticationPrincipal UserDetails userDetails,
@PathVariable("productId") Long productId) {
User user = userService.findUser(userDetails.getUsername());
likeService.deleteLike(productId, user.getId());
productService.deleteLikeCount(productService.findProduct(productId));

return ResponseEntity.status(HttpStatus.OK).body("success");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.dku.springstudy.domain.like.repository;

import com.dku.springstudy.domain.like.Likes;
import org.springframework.data.jpa.repository.JpaRepository;

public interface LikeRepository extends JpaRepository<Likes, Long> {
void deleteByProductIdAndUserId(Long productId, Long userId);
// void deleteByProductId(productId);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package com.dku.springstudy.domain.like.service;

import com.dku.springstudy.domain.like.Likes;
import com.dku.springstudy.domain.like.repository.LikeRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@Service
@Transactional(readOnly = true)
@RequiredArgsConstructor
public class LikeService {
private final LikeRepository likeRepository;

@Transactional
public Likes addLike(Likes likes){
return likeRepository.save(likes);
}

@Transactional
public void deleteLike(Long productId, Long userId){
likeRepository.deleteByProductIdAndUserId(productId, userId);
}

}
36 changes: 36 additions & 0 deletions src/main/java/com/dku/springstudy/domain/product/Category.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package com.dku.springstudy.domain.product;

import lombok.Getter;

@Getter
public enum Category {
/*
‘디지털기기’, ‘생활가전’, ‘가구/인테리어’, ‘유아동’, ‘생활/가공식품’,
‘유아도서’, ‘스포츠/레저’, ‘여성잡화’, ‘여성의류’, ‘남성패션/잡화’,
‘게임/취미’, ‘뷰티/미용’, ‘반려동물용품’, ‘도서/티켓/음반’, ‘식물’,
‘기타 중고물품’, ‘중고차’
*/
DIGITAL_DEVICE("디지털기기"),
HOME_ELECTRONIC("생활가전"),
FURNITURE_INTERIOR("가구/인테리어"),
CHILD("유아동"),
LIVING_PROCESSED_FOODS("생활/가공식품"),
CHILD_BOOK("유아도서"),
SPORTS_LEISURE("스포츠/레저"),
WOMAN_GOODS("여성잡화"),
WOMAN_CLOTHES("여성의류"),
MAN_FASHION_GOODS("남성패션/잡화"),
GAME_HOBBY("게임/취미"),
BEAUTY("뷰티/미용"),
PET_GOODS("반려동물용품"),
BOOK_TICKET_RECORD("도서/티켓/음반"),
PLANT("식물"),
USED_ETC("기타 중고물품"),
USED_CAR("중고차");

private final String korCategory;

Category(String korCategory) {
this.korCategory = korCategory;
}
}
61 changes: 61 additions & 0 deletions src/main/java/com/dku/springstudy/domain/product/Product.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
package com.dku.springstudy.domain.product;

import com.dku.springstudy.domain.BaseTimeEntity;
import com.dku.springstudy.domain.user.User;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.DynamicInsert;

import javax.persistence.*;

@Entity
@Getter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@DynamicInsert
public class Product extends BaseTimeEntity {
@Id
@GeneratedValue
private Long id;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "user_id")
private User user;

private String productName;
private String productImgUrl;
private Integer cost;
private String contents;
@ColumnDefault("0")
private Integer likeCount;

@Enumerated(EnumType.STRING)
private ProductStatus status;

@Enumerated(EnumType.STRING)
private Category category;

@Builder
public Product(String productName, Category category, Integer cost, String contents,
String productImgUrl, User user, ProductStatus productStatus, Integer likeCount) {
this.productName = productName;
this.category = category;
this.cost = cost;
this.contents = contents;
this.likeCount = likeCount;
this.productImgUrl = productImgUrl;
this.status = productStatus;
this.user = user;
}

public void addLikeCount() {
this.likeCount++;
}

public void deleteLikeCount() {
this.likeCount--;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.dku.springstudy.domain.product;

import lombok.Getter;

@Getter
public enum ProductStatus {
ON_SALE("판매중"), SOLD_OUT("판매완료"), RESERVED("예약중");

private final String korStatus;

ProductStatus(String korStatus) {
this.korStatus = korStatus;
}

}
Loading