From d3120b28c3092d64da35c1a79bfbbfab9fcbce95 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 1 Aug 2024 00:39:21 +0900 Subject: [PATCH 1/5] 1st version of Junyoung's Tools project. im feeling sorry tha t i cant make it on friday's meeting. so plz check my code and tell me something to fix. thanks. --- .../tools/potato_field/SecurityConfig.java | 2 ++ .../tools/potato_field/dto/LoginRequest.java | 2 ++ .../potato_field/service/MemberService.java | 35 +------------------ ...application.properties => application.yml} | 0 4 files changed, 5 insertions(+), 34 deletions(-) create mode 100644 potato-field/src/main/java/com/tools/potato_field/SecurityConfig.java create mode 100644 potato-field/src/main/java/com/tools/potato_field/dto/LoginRequest.java rename potato-field/src/main/resources/{application.properties => application.yml} (100%) diff --git a/potato-field/src/main/java/com/tools/potato_field/SecurityConfig.java b/potato-field/src/main/java/com/tools/potato_field/SecurityConfig.java new file mode 100644 index 0000000..1d66bf5 --- /dev/null +++ b/potato-field/src/main/java/com/tools/potato_field/SecurityConfig.java @@ -0,0 +1,2 @@ +package com.tools.potato_field;public class SecurityConfig { +} diff --git a/potato-field/src/main/java/com/tools/potato_field/dto/LoginRequest.java b/potato-field/src/main/java/com/tools/potato_field/dto/LoginRequest.java new file mode 100644 index 0000000..a13b99a --- /dev/null +++ b/potato-field/src/main/java/com/tools/potato_field/dto/LoginRequest.java @@ -0,0 +1,2 @@ +package com.tools.potato_field.dto;public class LoginRequest { +} diff --git a/potato-field/src/main/java/com/tools/potato_field/service/MemberService.java b/potato-field/src/main/java/com/tools/potato_field/service/MemberService.java index 4302aa5..1d2e0fc 100644 --- a/potato-field/src/main/java/com/tools/potato_field/service/MemberService.java +++ b/potato-field/src/main/java/com/tools/potato_field/service/MemberService.java @@ -1,35 +1,2 @@ -package com.tools.potato_field.service; - -import com.tools.potato_field.entity.Member; -import com.tools.potato_field.repository.MemberRepository; -import org.springframework.stereotype.Service; - -import javax.transaction.Transactional; -import java.util.List; - -@Service -@Transactional -public class MemberService { - private final MemberRepository memberRepository; - - public MemberService(MemberRepository memberRepository) { - this.memberRepository = memberRepository; - } - - public Member registerMember(Member member) { - return memberRepository.save(member); - } - - public Member findMember(Long id) { - return memberRepository.findById(id).orElseThrow(() -> new RuntimeException("Member not found")); - } - - public List findAllMembers() { - return memberRepository.findAll(); - } - - public void deleteMember(Long id) { - memberRepository.deleteById(id); - } +package com.tools.potato_field.service;public class MemberService { } - diff --git a/potato-field/src/main/resources/application.properties b/potato-field/src/main/resources/application.yml similarity index 100% rename from potato-field/src/main/resources/application.properties rename to potato-field/src/main/resources/application.yml From 81c69d5c3bb2b8c7e502ea04a73d91232b51087d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 5 Aug 2024 14:43:11 +0900 Subject: [PATCH 2/5] =?UTF-8?q?feat=20:=20member=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- potato-field/build.gradle | 8 +++ .../potato_field/PotatoFieldApplication.java | 3 -- .../tools/potato_field/SecurityConfig.java | 19 ++++++- .../controller/MemberController.java | 31 +++++++---- .../controller/OrderController.java | 4 +- .../tools/potato_field/dto/LoginRequest.java | 11 +++- .../tools/potato_field/entity/Delivery.java | 2 +- .../com/tools/potato_field/entity/Item.java | 2 +- .../com/tools/potato_field/entity/Member.java | 24 +++++++-- .../com/tools/potato_field/entity/Order.java | 13 +++-- .../repository/MemberRepository.java | 7 ++- .../repository/OrderRepository.java | 13 ++++- .../potato_field/service/MemberService.java | 54 ++++++++++++++++++- .../src/main/resources/application.yml | 24 ++++++++- 14 files changed, 183 insertions(+), 32 deletions(-) diff --git a/potato-field/build.gradle b/potato-field/build.gradle index 2936c12..6c3761c 100644 --- a/potato-field/build.gradle +++ b/potato-field/build.gradle @@ -25,9 +25,17 @@ repositories { dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-security' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'io.jsonwebtoken:jjwt-api:0.11.5' + runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5' + runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5' + runtimeOnly 'com.h2database:h2' compileOnly 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.security:spring-security-test' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } diff --git a/potato-field/src/main/java/com/tools/potato_field/PotatoFieldApplication.java b/potato-field/src/main/java/com/tools/potato_field/PotatoFieldApplication.java index 713061c..d295b4a 100644 --- a/potato-field/src/main/java/com/tools/potato_field/PotatoFieldApplication.java +++ b/potato-field/src/main/java/com/tools/potato_field/PotatoFieldApplication.java @@ -6,9 +6,6 @@ @SpringBootApplication public class PotatoFieldApplication { - // jy test -// sy test~~ - // sh test public static void main(String[] args) { SpringApplication.run(PotatoFieldApplication.class, args); } diff --git a/potato-field/src/main/java/com/tools/potato_field/SecurityConfig.java b/potato-field/src/main/java/com/tools/potato_field/SecurityConfig.java index 1d66bf5..3a9047e 100644 --- a/potato-field/src/main/java/com/tools/potato_field/SecurityConfig.java +++ b/potato-field/src/main/java/com/tools/potato_field/SecurityConfig.java @@ -1,2 +1,17 @@ -package com.tools.potato_field;public class SecurityConfig { -} +package com.tools.potato_field; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; + +@Configuration +public class SecurityConfig { + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } + + // 기타 보안 설정... +} \ No newline at end of file diff --git a/potato-field/src/main/java/com/tools/potato_field/controller/MemberController.java b/potato-field/src/main/java/com/tools/potato_field/controller/MemberController.java index 9248d47..8a56985 100644 --- a/potato-field/src/main/java/com/tools/potato_field/controller/MemberController.java +++ b/potato-field/src/main/java/com/tools/potato_field/controller/MemberController.java @@ -1,37 +1,48 @@ package com.tools.potato_field.controller; -import com.tools.potato_field.entity.member; +import com.tools.potato_field.entity.Member; import com.tools.potato_field.service.MemberService; +import com.tools.potato_field.dto.LoginRequest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import java.util.List; @RestController -@RequestMapping("/members") +@RequestMapping("/api/members") public class MemberController { + private final MemberService memberService; + @Autowired public MemberController(MemberService memberService) { this.memberService = memberService; } - @PostMapping - public Member registerMember(@RequestBody Member member) { - return memberService.registerMember(member); + @PostMapping("/register") + public ResponseEntity registerMember(@RequestBody Member member) { + return ResponseEntity.ok(memberService.registerMember(member)); } @GetMapping("/{id}") - public Member getMember(@PathVariable Long id) { - return memberService.findMember(id); + public ResponseEntity getMember(@PathVariable Long id) { + return ResponseEntity.ok(memberService.findMember(id)); } @GetMapping - public List getAllMembers() { - return memberService.findAllMembers(); + public ResponseEntity> getAllMembers() { + return ResponseEntity.ok(memberService.findAllMembers()); } @DeleteMapping("/{id}") - public void deleteMember(@PathVariable Long id) { + public ResponseEntity deleteMember(@PathVariable Long id) { memberService.deleteMember(id); + return ResponseEntity.ok().build(); + } + + @PostMapping("/login") + public ResponseEntity loginMember(@RequestBody LoginRequest loginRequest) { + return ResponseEntity.ok(memberService.loginMember(loginRequest.getEmail(), loginRequest.getPassword())); } } \ No newline at end of file diff --git a/potato-field/src/main/java/com/tools/potato_field/controller/OrderController.java b/potato-field/src/main/java/com/tools/potato_field/controller/OrderController.java index 65c1748..1391510 100644 --- a/potato-field/src/main/java/com/tools/potato_field/controller/OrderController.java +++ b/potato-field/src/main/java/com/tools/potato_field/controller/OrderController.java @@ -27,4 +27,6 @@ public Order getOrder(@PathVariable Long id) { @GetMapping public List getAllOrders() { - return orderService + return orderService.findAllOrders(); + } +} \ No newline at end of file diff --git a/potato-field/src/main/java/com/tools/potato_field/dto/LoginRequest.java b/potato-field/src/main/java/com/tools/potato_field/dto/LoginRequest.java index a13b99a..cf935c5 100644 --- a/potato-field/src/main/java/com/tools/potato_field/dto/LoginRequest.java +++ b/potato-field/src/main/java/com/tools/potato_field/dto/LoginRequest.java @@ -1,2 +1,9 @@ -package com.tools.potato_field.dto;public class LoginRequest { -} +package com.tools.potato_field.dto; + +import lombok.Data; + +@Data +public class LoginRequest { + private String email; + private String password; +} \ No newline at end of file diff --git a/potato-field/src/main/java/com/tools/potato_field/entity/Delivery.java b/potato-field/src/main/java/com/tools/potato_field/entity/Delivery.java index 5024747..292b13c 100644 --- a/potato-field/src/main/java/com/tools/potato_field/entity/Delivery.java +++ b/potato-field/src/main/java/com/tools/potato_field/entity/Delivery.java @@ -1,6 +1,6 @@ package com.tools.potato_field.entity; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.Data; @Entity diff --git a/potato-field/src/main/java/com/tools/potato_field/entity/Item.java b/potato-field/src/main/java/com/tools/potato_field/entity/Item.java index 8d02dfd..b333ab4 100644 --- a/potato-field/src/main/java/com/tools/potato_field/entity/Item.java +++ b/potato-field/src/main/java/com/tools/potato_field/entity/Item.java @@ -1,6 +1,6 @@ package com.tools.potato_field.entity; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.Data; @Entity diff --git a/potato-field/src/main/java/com/tools/potato_field/entity/Member.java b/potato-field/src/main/java/com/tools/potato_field/entity/Member.java index 280f459..66e9e0a 100644 --- a/potato-field/src/main/java/com/tools/potato_field/entity/Member.java +++ b/potato-field/src/main/java/com/tools/potato_field/entity/Member.java @@ -1,16 +1,32 @@ package com.tools.potato_field.entity; -import javax.persistence.*; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; -@Entity @Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Entity +@Table(name = "members") public class Member { + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - private String username; - private String password; + + @Column(nullable = false, unique = true) private String email; + + @Column(nullable = false) + private String password; + + private String name; + private String address; + + // 추가적인 필드들 (예: 생년월일, 전화번호 등) } \ No newline at end of file diff --git a/potato-field/src/main/java/com/tools/potato_field/entity/Order.java b/potato-field/src/main/java/com/tools/potato_field/entity/Order.java index 6a349c8..c7dbb06 100644 --- a/potato-field/src/main/java/com/tools/potato_field/entity/Order.java +++ b/potato-field/src/main/java/com/tools/potato_field/entity/Order.java @@ -1,19 +1,26 @@ -package com.example.ex01.service; +package com.tools.potato_field.entity; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.Data; import java.time.LocalDateTime; @Entity @Data +@Table(name = "orders") // 'order'는 예약어이므로 'orders'로 사용 public class Order { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @ManyToOne + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "member_id") private Member member; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "item_id") + private Item item; + private LocalDateTime orderDate; + + private String orderStatus; } \ No newline at end of file diff --git a/potato-field/src/main/java/com/tools/potato_field/repository/MemberRepository.java b/potato-field/src/main/java/com/tools/potato_field/repository/MemberRepository.java index ef6715a..ea2a577 100644 --- a/potato-field/src/main/java/com/tools/potato_field/repository/MemberRepository.java +++ b/potato-field/src/main/java/com/tools/potato_field/repository/MemberRepository.java @@ -2,6 +2,11 @@ import com.tools.potato_field.entity.Member; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; +import java.util.Optional; + +@Repository public interface MemberRepository extends JpaRepository { -} + Optional findByEmail(String email); +} \ No newline at end of file diff --git a/potato-field/src/main/java/com/tools/potato_field/repository/OrderRepository.java b/potato-field/src/main/java/com/tools/potato_field/repository/OrderRepository.java index 8e5bb4f..788e3f8 100644 --- a/potato-field/src/main/java/com/tools/potato_field/repository/OrderRepository.java +++ b/potato-field/src/main/java/com/tools/potato_field/repository/OrderRepository.java @@ -2,6 +2,17 @@ import com.tools.potato_field.entity.Order; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; +import java.util.List; + +@Repository public interface OrderRepository extends JpaRepository { -} + // 회원 ID로 주문 목록 조회 + List findByMemberId(Long memberId); + + // 주문 상태로 주문 목록 조회 + List findByOrderStatus(String orderStatus); + + // 추가적인 쿼리 메서드들을 필요에 따라 정의할 수 있습니다. +} \ No newline at end of file diff --git a/potato-field/src/main/java/com/tools/potato_field/service/MemberService.java b/potato-field/src/main/java/com/tools/potato_field/service/MemberService.java index 1d2e0fc..371583f 100644 --- a/potato-field/src/main/java/com/tools/potato_field/service/MemberService.java +++ b/potato-field/src/main/java/com/tools/potato_field/service/MemberService.java @@ -1,2 +1,52 @@ -package com.tools.potato_field.service;public class MemberService { -} +package com.tools.potato_field.service; + +import com.tools.potato_field.entity.Member; +import com.tools.potato_field.repository.MemberRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class MemberService { + + private final MemberRepository memberRepository; + private final PasswordEncoder passwordEncoder; + + @Autowired + public MemberService(MemberRepository memberRepository, PasswordEncoder passwordEncoder) { + this.memberRepository = memberRepository; + this.passwordEncoder = passwordEncoder; + } + + public Member registerMember(Member member) { + if (memberRepository.findByEmail(member.getEmail()).isPresent()) { + throw new RuntimeException("Email is already in use"); + } + member.setPassword(passwordEncoder.encode(member.getPassword())); + return memberRepository.save(member); + } + + public Member findMember(Long id) { + return memberRepository.findById(id) + .orElseThrow(() -> new RuntimeException("Member not found")); + } + + public List findAllMembers() { + return memberRepository.findAll(); + } + + public void deleteMember(Long id) { + memberRepository.deleteById(id); + } + + public Member loginMember(String email, String password) { + Member member = memberRepository.findByEmail(email) + .orElseThrow(() -> new RuntimeException("Member not found")); + if (!passwordEncoder.matches(password, member.getPassword())) { + throw new RuntimeException("Invalid password"); + } + return member; + } +} \ No newline at end of file diff --git a/potato-field/src/main/resources/application.yml b/potato-field/src/main/resources/application.yml index d6a83d9..3a9ece4 100644 --- a/potato-field/src/main/resources/application.yml +++ b/potato-field/src/main/resources/application.yml @@ -1 +1,23 @@ -spring.application.name=potato-field +spring: + application: + name: potato-field + datasource: + url: jdbc:h2:mem:testdb + driver-class-name: org.h2.Driver + username: sa + password: + jpa: + database-platform: org.hibernate.dialect.H2Dialect + hibernate: + ddl-auto: update + show-sql: true + h2: + console: + enabled: true + path: /h2-console + jwt: + secret: yourSecretKey + expiration: 86400000 # 24 hours + +server: + port: 8080 \ No newline at end of file From 0a9b866f32c7c8a150c2aaf2fad1642edced8117 Mon Sep 17 00:00:00 2001 From: jeongminuk Date: Mon, 5 Aug 2024 15:17:50 +0900 Subject: [PATCH 3/5] structure_repack --- .../com/tools/potato_field/{entity => delivery}/Delivery.java | 0 .../potato_field/{controller => delivery}/DeliveryController.java | 0 .../potato_field/{repository => delivery}/DeliveryRepository.java | 0 .../tools/potato_field/{service => delivery}/DeliveryService.java | 0 .../main/java/com/tools/potato_field/{entity => item}/Item.java | 0 .../tools/potato_field/{controller => item}/ItemController.java | 0 .../tools/potato_field/{repository => item}/ItemRepository.java | 0 .../com/tools/potato_field/{service => item}/ItemService.java | 0 .../java/com/tools/potato_field/{entity => member}/Member.java | 0 .../potato_field/{controller => member}/MemberController.java | 0 .../potato_field/{repository => member}/MemberRepository.java | 0 .../com/tools/potato_field/{service => member}/MemberService.java | 0 .../main/java/com/tools/potato_field/{entity => order}/Order.java | 0 .../tools/potato_field/{controller => order}/OrderController.java | 0 .../tools/potato_field/{repository => order}/OrderRepository.java | 0 .../com/tools/potato_field/{service => order}/OrderService.java | 0 16 files changed, 0 insertions(+), 0 deletions(-) rename potato-field/src/main/java/com/tools/potato_field/{entity => delivery}/Delivery.java (100%) rename potato-field/src/main/java/com/tools/potato_field/{controller => delivery}/DeliveryController.java (100%) rename potato-field/src/main/java/com/tools/potato_field/{repository => delivery}/DeliveryRepository.java (100%) rename potato-field/src/main/java/com/tools/potato_field/{service => delivery}/DeliveryService.java (100%) rename potato-field/src/main/java/com/tools/potato_field/{entity => item}/Item.java (100%) rename potato-field/src/main/java/com/tools/potato_field/{controller => item}/ItemController.java (100%) rename potato-field/src/main/java/com/tools/potato_field/{repository => item}/ItemRepository.java (100%) rename potato-field/src/main/java/com/tools/potato_field/{service => item}/ItemService.java (100%) rename potato-field/src/main/java/com/tools/potato_field/{entity => member}/Member.java (100%) rename potato-field/src/main/java/com/tools/potato_field/{controller => member}/MemberController.java (100%) rename potato-field/src/main/java/com/tools/potato_field/{repository => member}/MemberRepository.java (100%) rename potato-field/src/main/java/com/tools/potato_field/{service => member}/MemberService.java (100%) rename potato-field/src/main/java/com/tools/potato_field/{entity => order}/Order.java (100%) rename potato-field/src/main/java/com/tools/potato_field/{controller => order}/OrderController.java (100%) rename potato-field/src/main/java/com/tools/potato_field/{repository => order}/OrderRepository.java (100%) rename potato-field/src/main/java/com/tools/potato_field/{service => order}/OrderService.java (100%) diff --git a/potato-field/src/main/java/com/tools/potato_field/entity/Delivery.java b/potato-field/src/main/java/com/tools/potato_field/delivery/Delivery.java similarity index 100% rename from potato-field/src/main/java/com/tools/potato_field/entity/Delivery.java rename to potato-field/src/main/java/com/tools/potato_field/delivery/Delivery.java diff --git a/potato-field/src/main/java/com/tools/potato_field/controller/DeliveryController.java b/potato-field/src/main/java/com/tools/potato_field/delivery/DeliveryController.java similarity index 100% rename from potato-field/src/main/java/com/tools/potato_field/controller/DeliveryController.java rename to potato-field/src/main/java/com/tools/potato_field/delivery/DeliveryController.java diff --git a/potato-field/src/main/java/com/tools/potato_field/repository/DeliveryRepository.java b/potato-field/src/main/java/com/tools/potato_field/delivery/DeliveryRepository.java similarity index 100% rename from potato-field/src/main/java/com/tools/potato_field/repository/DeliveryRepository.java rename to potato-field/src/main/java/com/tools/potato_field/delivery/DeliveryRepository.java diff --git a/potato-field/src/main/java/com/tools/potato_field/service/DeliveryService.java b/potato-field/src/main/java/com/tools/potato_field/delivery/DeliveryService.java similarity index 100% rename from potato-field/src/main/java/com/tools/potato_field/service/DeliveryService.java rename to potato-field/src/main/java/com/tools/potato_field/delivery/DeliveryService.java diff --git a/potato-field/src/main/java/com/tools/potato_field/entity/Item.java b/potato-field/src/main/java/com/tools/potato_field/item/Item.java similarity index 100% rename from potato-field/src/main/java/com/tools/potato_field/entity/Item.java rename to potato-field/src/main/java/com/tools/potato_field/item/Item.java diff --git a/potato-field/src/main/java/com/tools/potato_field/controller/ItemController.java b/potato-field/src/main/java/com/tools/potato_field/item/ItemController.java similarity index 100% rename from potato-field/src/main/java/com/tools/potato_field/controller/ItemController.java rename to potato-field/src/main/java/com/tools/potato_field/item/ItemController.java diff --git a/potato-field/src/main/java/com/tools/potato_field/repository/ItemRepository.java b/potato-field/src/main/java/com/tools/potato_field/item/ItemRepository.java similarity index 100% rename from potato-field/src/main/java/com/tools/potato_field/repository/ItemRepository.java rename to potato-field/src/main/java/com/tools/potato_field/item/ItemRepository.java diff --git a/potato-field/src/main/java/com/tools/potato_field/service/ItemService.java b/potato-field/src/main/java/com/tools/potato_field/item/ItemService.java similarity index 100% rename from potato-field/src/main/java/com/tools/potato_field/service/ItemService.java rename to potato-field/src/main/java/com/tools/potato_field/item/ItemService.java diff --git a/potato-field/src/main/java/com/tools/potato_field/entity/Member.java b/potato-field/src/main/java/com/tools/potato_field/member/Member.java similarity index 100% rename from potato-field/src/main/java/com/tools/potato_field/entity/Member.java rename to potato-field/src/main/java/com/tools/potato_field/member/Member.java diff --git a/potato-field/src/main/java/com/tools/potato_field/controller/MemberController.java b/potato-field/src/main/java/com/tools/potato_field/member/MemberController.java similarity index 100% rename from potato-field/src/main/java/com/tools/potato_field/controller/MemberController.java rename to potato-field/src/main/java/com/tools/potato_field/member/MemberController.java diff --git a/potato-field/src/main/java/com/tools/potato_field/repository/MemberRepository.java b/potato-field/src/main/java/com/tools/potato_field/member/MemberRepository.java similarity index 100% rename from potato-field/src/main/java/com/tools/potato_field/repository/MemberRepository.java rename to potato-field/src/main/java/com/tools/potato_field/member/MemberRepository.java diff --git a/potato-field/src/main/java/com/tools/potato_field/service/MemberService.java b/potato-field/src/main/java/com/tools/potato_field/member/MemberService.java similarity index 100% rename from potato-field/src/main/java/com/tools/potato_field/service/MemberService.java rename to potato-field/src/main/java/com/tools/potato_field/member/MemberService.java diff --git a/potato-field/src/main/java/com/tools/potato_field/entity/Order.java b/potato-field/src/main/java/com/tools/potato_field/order/Order.java similarity index 100% rename from potato-field/src/main/java/com/tools/potato_field/entity/Order.java rename to potato-field/src/main/java/com/tools/potato_field/order/Order.java diff --git a/potato-field/src/main/java/com/tools/potato_field/controller/OrderController.java b/potato-field/src/main/java/com/tools/potato_field/order/OrderController.java similarity index 100% rename from potato-field/src/main/java/com/tools/potato_field/controller/OrderController.java rename to potato-field/src/main/java/com/tools/potato_field/order/OrderController.java diff --git a/potato-field/src/main/java/com/tools/potato_field/repository/OrderRepository.java b/potato-field/src/main/java/com/tools/potato_field/order/OrderRepository.java similarity index 100% rename from potato-field/src/main/java/com/tools/potato_field/repository/OrderRepository.java rename to potato-field/src/main/java/com/tools/potato_field/order/OrderRepository.java diff --git a/potato-field/src/main/java/com/tools/potato_field/service/OrderService.java b/potato-field/src/main/java/com/tools/potato_field/order/OrderService.java similarity index 100% rename from potato-field/src/main/java/com/tools/potato_field/service/OrderService.java rename to potato-field/src/main/java/com/tools/potato_field/order/OrderService.java From a26f73d683440b9159faf7412ecac0c849fc1060 Mon Sep 17 00:00:00 2001 From: hwi-hwi-hwi <164748897+hwi-hwi-hwi@users.noreply.github.com> Date: Mon, 12 Aug 2024 16:59:25 +0900 Subject: [PATCH 4/5] sss --- .../com/tools/potato_field/entity/Category.java | 10 ++++++++++ .../com/tools/potato_field/entity/Category_1.java | 10 ++++++++++ .../java/com/tools/potato_field/entity/Item.java | 13 ++++++++++--- 3 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 potato-field/src/main/java/com/tools/potato_field/entity/Category.java create mode 100644 potato-field/src/main/java/com/tools/potato_field/entity/Category_1.java diff --git a/potato-field/src/main/java/com/tools/potato_field/entity/Category.java b/potato-field/src/main/java/com/tools/potato_field/entity/Category.java new file mode 100644 index 0000000..90413ca --- /dev/null +++ b/potato-field/src/main/java/com/tools/potato_field/entity/Category.java @@ -0,0 +1,10 @@ +package com.tools.potato_field.entity; + +@Entity +public class Category { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String placeName; +} diff --git a/potato-field/src/main/java/com/tools/potato_field/entity/Category_1.java b/potato-field/src/main/java/com/tools/potato_field/entity/Category_1.java new file mode 100644 index 0000000..551d783 --- /dev/null +++ b/potato-field/src/main/java/com/tools/potato_field/entity/Category_1.java @@ -0,0 +1,10 @@ +package com.tools.potato_field.entity; + +@Entity +public class Category_1 { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String genderName; +} diff --git a/potato-field/src/main/java/com/tools/potato_field/entity/Item.java b/potato-field/src/main/java/com/tools/potato_field/entity/Item.java index 8d02dfd..5e7ce4b 100644 --- a/potato-field/src/main/java/com/tools/potato_field/entity/Item.java +++ b/potato-field/src/main/java/com/tools/potato_field/entity/Item.java @@ -9,7 +9,14 @@ public class Item { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - private String name; - private double price; - private int stockQuantity; + private String itemName; + private String itemURL; + private Integer iconNumber; + private Long id2; + + @ManyToOne + @JoinColumn(name = "member_id") + private Member member; + + // Getters and Setters } \ No newline at end of file From 9c799de6843cab035d7deb2cc6f995714ea6f2bb Mon Sep 17 00:00:00 2001 From: hwi-hwi-hwi <164748897+hwi-hwi-hwi@users.noreply.github.com> Date: Mon, 12 Aug 2024 17:29:28 +0900 Subject: [PATCH 5/5] Your commit message --- .../main/java/com/tools/potato_field/entity/Category.java | 5 +++++ .../main/java/com/tools/potato_field/entity/Category_1.java | 5 +++++ .../src/main/java/com/tools/potato_field/item/Item.java | 3 ++- .../java/com/tools/potato_field/item/ItemController.java | 4 ++-- .../java/com/tools/potato_field/item/ItemRepository.java | 3 +-- .../main/java/com/tools/potato_field/item/ItemService.java | 6 ++---- 6 files changed, 17 insertions(+), 9 deletions(-) diff --git a/potato-field/src/main/java/com/tools/potato_field/entity/Category.java b/potato-field/src/main/java/com/tools/potato_field/entity/Category.java index 90413ca..a7f920a 100644 --- a/potato-field/src/main/java/com/tools/potato_field/entity/Category.java +++ b/potato-field/src/main/java/com/tools/potato_field/entity/Category.java @@ -1,5 +1,10 @@ package com.tools.potato_field.entity; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; + @Entity public class Category { @Id diff --git a/potato-field/src/main/java/com/tools/potato_field/entity/Category_1.java b/potato-field/src/main/java/com/tools/potato_field/entity/Category_1.java index 551d783..b1b7bcf 100644 --- a/potato-field/src/main/java/com/tools/potato_field/entity/Category_1.java +++ b/potato-field/src/main/java/com/tools/potato_field/entity/Category_1.java @@ -1,5 +1,10 @@ package com.tools.potato_field.entity; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; + @Entity public class Category_1 { @Id diff --git a/potato-field/src/main/java/com/tools/potato_field/item/Item.java b/potato-field/src/main/java/com/tools/potato_field/item/Item.java index 3ccd091..4c41e59 100644 --- a/potato-field/src/main/java/com/tools/potato_field/item/Item.java +++ b/potato-field/src/main/java/com/tools/potato_field/item/Item.java @@ -1,5 +1,6 @@ -package com.tools.potato_field.entity; +package com.tools.potato_field.item; +import com.tools.potato_field.entity.Member; import jakarta.persistence.*; import lombok.Data; diff --git a/potato-field/src/main/java/com/tools/potato_field/item/ItemController.java b/potato-field/src/main/java/com/tools/potato_field/item/ItemController.java index 57105d1..eb6674d 100644 --- a/potato-field/src/main/java/com/tools/potato_field/item/ItemController.java +++ b/potato-field/src/main/java/com/tools/potato_field/item/ItemController.java @@ -1,7 +1,7 @@ package com.tools.potato_field.controller; -import com.tools.potato_field.entity.Item; -import com.tools.potato_field.service.ItemService; +import com.tools.potato_field.item.Item; +import com.tools.potato_field.item.ItemService; import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/potato-field/src/main/java/com/tools/potato_field/item/ItemRepository.java b/potato-field/src/main/java/com/tools/potato_field/item/ItemRepository.java index e6f1028..991065d 100644 --- a/potato-field/src/main/java/com/tools/potato_field/item/ItemRepository.java +++ b/potato-field/src/main/java/com/tools/potato_field/item/ItemRepository.java @@ -1,6 +1,5 @@ -package com.tools.potato_field.repository; +package com.tools.potato_field.item; -import com.tools.potato_field.entity.Item; import org.springframework.data.jpa.repository.JpaRepository; public interface ItemRepository extends JpaRepository { diff --git a/potato-field/src/main/java/com/tools/potato_field/item/ItemService.java b/potato-field/src/main/java/com/tools/potato_field/item/ItemService.java index 0d0bd28..1cb55f7 100644 --- a/potato-field/src/main/java/com/tools/potato_field/item/ItemService.java +++ b/potato-field/src/main/java/com/tools/potato_field/item/ItemService.java @@ -1,10 +1,8 @@ -package com.tools.potato_field.service; +package com.tools.potato_field.item; -import com.tools.potato_field.entity.Item; -import com.tools.potato_field.repository.ItemRepository; +import jakarta.transaction.Transactional; import org.springframework.stereotype.Service; -import javax.transaction.Transactional; import java.util.List; @Service