Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 38aa68e

Browse files
author
Ivan Franchin
committed
Refactor application packages
1 parent bcae5f6 commit 38aa68e

19 files changed

+43
-54
lines changed

‎order-api/src/main/java/com/ivanfranchin/orderapi/model/Order.java‎ renamed to ‎order-api/src/main/java/com/ivanfranchin/orderapi/order/Order.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package com.ivanfranchin.orderapi.model;
1+
package com.ivanfranchin.orderapi.order;
22

3+
import com.ivanfranchin.orderapi.user.User;
34
import com.ivanfranchin.orderapi.rest.dto.CreateOrderRequest;
45
import jakarta.persistence.Entity;
56
import jakarta.persistence.FetchType;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.ivanfranchin.orderapi.exception;
1+
package com.ivanfranchin.orderapi.order;
22

33
import org.springframework.http.HttpStatus;
44
import org.springframework.web.bind.annotation.ResponseStatus;

‎order-api/src/main/java/com/ivanfranchin/orderapi/repository/OrderRepository.java‎ renamed to ‎order-api/src/main/java/com/ivanfranchin/orderapi/order/OrderRepository.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package com.ivanfranchin.orderapi.repository;
1+
package com.ivanfranchin.orderapi.order;
22

3-
import com.ivanfranchin.orderapi.model.Order;
43
import org.springframework.data.jpa.repository.JpaRepository;
54
import org.springframework.stereotype.Repository;
65

‎order-api/src/main/java/com/ivanfranchin/orderapi/service/OrderService.java‎ renamed to ‎order-api/src/main/java/com/ivanfranchin/orderapi/order/OrderService.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
package com.ivanfranchin.orderapi.service;
2-
3-
import com.ivanfranchin.orderapi.model.Order;
1+
package com.ivanfranchin.orderapi.order;
42

53
import java.util.List;
64

‎order-api/src/main/java/com/ivanfranchin/orderapi/service/OrderServiceImpl.java‎ renamed to ‎order-api/src/main/java/com/ivanfranchin/orderapi/order/OrderServiceImpl.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
package com.ivanfranchin.orderapi.service;
1+
package com.ivanfranchin.orderapi.order;
22

3-
import com.ivanfranchin.orderapi.repository.OrderRepository;
4-
import com.ivanfranchin.orderapi.exception.OrderNotFoundException;
5-
import com.ivanfranchin.orderapi.model.Order;
63
import lombok.RequiredArgsConstructor;
74
import org.springframework.stereotype.Service;
85

‎order-api/src/main/java/com/ivanfranchin/orderapi/rest/AuthController.java‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package com.ivanfranchin.orderapi.rest;
22

3-
import com.ivanfranchin.orderapi.exception.DuplicatedUserInfoException;
4-
import com.ivanfranchin.orderapi.model.User;
53
import com.ivanfranchin.orderapi.rest.dto.AuthResponse;
64
import com.ivanfranchin.orderapi.rest.dto.LoginRequest;
75
import com.ivanfranchin.orderapi.rest.dto.SignUpRequest;
6+
import com.ivanfranchin.orderapi.security.SecurityConfig;
87
import com.ivanfranchin.orderapi.security.TokenProvider;
9-
import com.ivanfranchin.orderapi.service.UserService;
8+
import com.ivanfranchin.orderapi.user.DuplicatedUserInfoException;
9+
import com.ivanfranchin.orderapi.user.User;
10+
import com.ivanfranchin.orderapi.user.UserService;
1011
import jakarta.validation.Valid;
1112
import lombok.RequiredArgsConstructor;
1213
import org.springframework.http.HttpStatus;
@@ -46,7 +47,7 @@ public AuthResponse signUp(@Valid @RequestBody SignUpRequest signUpRequest) {
4647
throw new DuplicatedUserInfoException(String.format("Email %s already been used", signUpRequest.email()));
4748
}
4849

49-
userService.saveUser(User.from(signUpRequest));
50+
userService.saveUser(this.mapSignUpRequestToUser(signUpRequest));
5051

5152
String token = authenticateAndGetToken(signUpRequest.username(), signUpRequest.password());
5253
return new AuthResponse(token);
@@ -56,4 +57,14 @@ private String authenticateAndGetToken(String username, String password) {
5657
Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(username, password));
5758
return tokenProvider.generate(authentication);
5859
}
60+
61+
private User mapSignUpRequestToUser(SignUpRequest signUpRequest) {
62+
User user = new User();
63+
user.setUsername(signUpRequest.username());
64+
user.setPassword(passwordEncoder.encode(signUpRequest.password()));
65+
user.setName(signUpRequest.name());
66+
user.setEmail(signUpRequest.email());
67+
user.setRole(SecurityConfig.USER);
68+
return user;
69+
}
5970
}

‎order-api/src/main/java/com/ivanfranchin/orderapi/rest/OrderController.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.ivanfranchin.orderapi.rest;
22

3-
import com.ivanfranchin.orderapi.model.Order;
4-
import com.ivanfranchin.orderapi.model.User;
3+
import com.ivanfranchin.orderapi.order.Order;
4+
import com.ivanfranchin.orderapi.user.User;
55
import com.ivanfranchin.orderapi.rest.dto.CreateOrderRequest;
66
import com.ivanfranchin.orderapi.rest.dto.OrderDto;
77
import com.ivanfranchin.orderapi.security.CustomUserDetails;
8-
import com.ivanfranchin.orderapi.service.OrderService;
9-
import com.ivanfranchin.orderapi.service.UserService;
8+
import com.ivanfranchin.orderapi.order.OrderService;
9+
import com.ivanfranchin.orderapi.user.UserService;
1010
import io.swagger.v3.oas.annotations.Operation;
1111
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
1212
import jakarta.validation.Valid;

‎order-api/src/main/java/com/ivanfranchin/orderapi/rest/PublicController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.ivanfranchin.orderapi.rest;
22

3-
import com.ivanfranchin.orderapi.service.OrderService;
4-
import com.ivanfranchin.orderapi.service.UserService;
3+
import com.ivanfranchin.orderapi.order.OrderService;
4+
import com.ivanfranchin.orderapi.user.UserService;
55
import lombok.RequiredArgsConstructor;
66
import org.springframework.web.bind.annotation.GetMapping;
77
import org.springframework.web.bind.annotation.RequestMapping;

‎order-api/src/main/java/com/ivanfranchin/orderapi/rest/UserController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.ivanfranchin.orderapi.rest;
22

3-
import com.ivanfranchin.orderapi.model.User;
3+
import com.ivanfranchin.orderapi.user.User;
44
import com.ivanfranchin.orderapi.rest.dto.UserDto;
55
import com.ivanfranchin.orderapi.security.CustomUserDetails;
6-
import com.ivanfranchin.orderapi.service.UserService;
6+
import com.ivanfranchin.orderapi.user.UserService;
77
import io.swagger.v3.oas.annotations.Operation;
88
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
99
import lombok.RequiredArgsConstructor;

‎order-api/src/main/java/com/ivanfranchin/orderapi/rest/dto/OrderDto.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.ivanfranchin.orderapi.rest.dto;
22

3-
import com.ivanfranchin.orderapi.model.Order;
3+
import com.ivanfranchin.orderapi.order.Order;
44

55
import java.time.Instant;
66

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /