Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d493b07

Browse files
author
ABDERRAOUF MAKHLOUF
committed
chore() refactor code
1 parent cec535d commit d493b07

File tree

12 files changed

+40
-52
lines changed

12 files changed

+40
-52
lines changed

‎src/main/java/com/sopromadze/blogapi/controller/AuthController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ public ResponseEntity<JwtAuthenticationResponse> authenticateUser(@Valid @Reques
6464

6565
@PostMapping("/signup")
6666
public ResponseEntity<ApiResponse> registerUser(@Valid @RequestBody SignUpRequest signUpRequest) {
67-
if (userRepository.existsByUsername(signUpRequest.getUsername())) {
67+
if (Boolean.TRUE.equals(userRepository.existsByUsername(signUpRequest.getUsername()))) {
6868
throw new BlogapiException(HttpStatus.BAD_REQUEST, "Username is already taken");
6969
}
7070

71-
if (userRepository.existsByEmail(signUpRequest.getEmail())) {
71+
if (Boolean.TRUE.equals(userRepository.existsByEmail(signUpRequest.getEmail()))) {
7272
throw new BlogapiException(HttpStatus.BAD_REQUEST, "Email is already taken");
7373
}
7474

‎src/main/java/com/sopromadze/blogapi/controller/TodoController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public ResponseEntity<Todo> updateTodo(@PathVariable(value = "id") Long id, @Val
7272
public ResponseEntity<ApiResponse> deleteTodo(@PathVariable(value = "id") Long id, @CurrentUser UserPrincipal currentUser) {
7373
ApiResponse apiResponse = todoService.deleteTodo(id, currentUser);
7474

75-
return new ResponseEntity<ApiResponse>(apiResponse, HttpStatus.OK);
75+
return new ResponseEntity<>(apiResponse, HttpStatus.OK);
7676
}
7777

7878
@PutMapping("/{id}/complete")

‎src/main/java/com/sopromadze/blogapi/model/Photo.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.sopromadze.blogapi.model;
22

33
import com.fasterxml.jackson.annotation.JsonIgnore;
4-
import com.sopromadze.blogapi.model.Album;
54
import com.sopromadze.blogapi.model.audit.UserDateAudit;
65
import lombok.Data;
76
import lombok.EqualsAndHashCode;

‎src/main/java/com/sopromadze/blogapi/repository/UserRepository.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.sopromadze.blogapi.repository;
22

3+
import com.sopromadze.blogapi.exception.ResourceNotFoundException;
34
import com.sopromadze.blogapi.model.user.User;
5+
import com.sopromadze.blogapi.security.UserPrincipal;
46
import org.springframework.data.jpa.repository.JpaRepository;
57
import org.springframework.stereotype.Repository;
68

@@ -18,4 +20,13 @@ public interface UserRepository extends JpaRepository<User, Long> {
1820
Boolean existsByEmail(@NotBlank String email);
1921

2022
Optional<User> findByUsernameOrEmail(String username, String email);
23+
24+
default User getUser(UserPrincipal currentUser) {
25+
return getUserByName(currentUser.getUsername());
26+
}
27+
28+
default User getUserByName(String username) {
29+
return findByUsername(username)
30+
.orElseThrow(() -> new ResourceNotFoundException("User", "username", username));
31+
}
2132
}

‎src/main/java/com/sopromadze/blogapi/service/impl/AlbumServiceImpl.java‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ public class AlbumServiceImpl implements AlbumService {
3737

3838
private static final String ALBUM_STR = "Album";
3939

40-
private static final String USER_STR = "User";
41-
42-
private static final String USERNAME_STR = "username";
43-
4440
private static final String YOU_DON_T_HAVE_PERMISSION_TO_MAKE_THIS_OPERATION = "You don't have permission to make this operation";
4541

4642
@Autowired
@@ -73,8 +69,7 @@ public PagedResponse<AlbumResponse> getAllAlbums(int page, int size) {
7369

7470
@Override
7571
public ResponseEntity<Album> addAlbum(AlbumRequest albumRequest, UserPrincipal currentUser) {
76-
User user = userRepository.findByUsername(currentUser.getUsername())
77-
.orElseThrow(() -> new ResourceNotFoundException(USER_STR, USERNAME_STR, currentUser.getUsername()));
72+
User user = userRepository.getUser(currentUser);
7873

7974
Album album = new Album();
8075

@@ -94,8 +89,7 @@ public ResponseEntity<Album> getAlbum(Long id) {
9489
@Override
9590
public ResponseEntity<AlbumResponse> updateAlbum(Long id, AlbumRequest newAlbum, UserPrincipal currentUser) {
9691
Album album = albumRepository.findById(id).orElseThrow(() -> new ResourceNotFoundException(ALBUM_STR, ID, id));
97-
User user = userRepository.findByUsername(currentUser.getUsername())
98-
.orElseThrow(() -> new ResourceNotFoundException(USER_STR, USERNAME_STR, currentUser.getUsername()));
92+
User user = userRepository.getUser(currentUser);
9993
if (album.getUser().getId().equals(user.getId()) || currentUser.getAuthorities()
10094
.contains(new SimpleGrantedAuthority(RoleName.ROLE_ADMIN.toString()))) {
10195
album.setTitle(newAlbum.getTitle());
@@ -114,8 +108,7 @@ public ResponseEntity<AlbumResponse> updateAlbum(Long id, AlbumRequest newAlbum,
114108
@Override
115109
public ResponseEntity<ApiResponse> deleteAlbum(Long id, UserPrincipal currentUser) {
116110
Album album = albumRepository.findById(id).orElseThrow(() -> new ResourceNotFoundException(ALBUM_STR, ID, id));
117-
User user = userRepository.findByUsername(currentUser.getUsername())
118-
.orElseThrow(() -> new ResourceNotFoundException(USER_STR, USERNAME_STR, currentUser.getUsername()));
111+
User user = userRepository.getUser(currentUser);
119112
if (album.getUser().getId().equals(user.getId()) || currentUser.getAuthorities()
120113
.contains(new SimpleGrantedAuthority(RoleName.ROLE_ADMIN.toString()))) {
121114
albumRepository.deleteById(id);
@@ -127,7 +120,8 @@ public ResponseEntity<ApiResponse> deleteAlbum(Long id, UserPrincipal currentUse
127120

128121
@Override
129122
public PagedResponse<Album> getUserAlbums(String username, int page, int size) {
130-
User user = userRepository.findByUsername(username).orElseThrow(() -> new ResourceNotFoundException(USER_STR, USERNAME_STR, username));
123+
User user = userRepository.getUserByName(username);
124+
131125
Pageable pageable = PageRequest.of(page, size, Sort.Direction.DESC, CREATED_AT);
132126

133127
Page<Album> albums = albumRepository.findByCreatedBy(user.getId(), pageable);

‎src/main/java/com/sopromadze/blogapi/service/impl/CategoryServiceImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public ResponseEntity<Category> addCategory(Category category, UserPrincipal cur
5656
}
5757

5858
@Override
59-
public ResponseEntity<Category> updateCategory(Long id, Category newCategory, UserPrincipal currentUser) throws UnauthorizedException {
59+
public ResponseEntity<Category> updateCategory(Long id, Category newCategory, UserPrincipal currentUser) {
6060
Category category = categoryRepository.findById(id).orElseThrow(() -> new ResourceNotFoundException("Category", "id", id));
6161
if (category.getCreatedBy().equals(currentUser.getId()) || currentUser.getAuthorities()
6262
.contains(new SimpleGrantedAuthority(RoleName.ROLE_ADMIN.toString()))) {
@@ -69,7 +69,7 @@ public ResponseEntity<Category> updateCategory(Long id, Category newCategory, Us
6969
}
7070

7171
@Override
72-
public ResponseEntity<ApiResponse> deleteCategory(Long id, UserPrincipal currentUser) throws UnauthorizedException {
72+
public ResponseEntity<ApiResponse> deleteCategory(Long id, UserPrincipal currentUser) {
7373
Category category = categoryRepository.findById(id).orElseThrow(() -> new ResourceNotFoundException("category", "id", id));
7474
if (category.getCreatedBy().equals(currentUser.getId()) || currentUser.getAuthorities()
7575
.contains(new SimpleGrantedAuthority(RoleName.ROLE_ADMIN.toString()))) {

‎src/main/java/com/sopromadze/blogapi/service/impl/CommentServiceImpl.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ public PagedResponse<Comment> getAllComments(Long postId, int page, int size) {
6262
public Comment addComment(CommentRequest commentRequest, Long postId, UserPrincipal currentUser) {
6363
Post post = postRepository.findById(postId)
6464
.orElseThrow(() -> new ResourceNotFoundException(POST_STR, ID_STR, postId));
65-
User user = userRepository.findByUsername(currentUser.getUsername())
66-
.orElseThrow(() -> new ResourceNotFoundException("User", "username", currentUser.getUsername()));
65+
User user = userRepository.getUser(currentUser);
6766
Comment comment = new Comment(commentRequest.getBody());
6867
comment.setUser(user);
6968
comment.setPost(post);

‎src/main/java/com/sopromadze/blogapi/service/impl/CustomUserDetailsServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class CustomUserDetailsServiceImpl implements UserDetailsService, CustomU
1919

2020
@Override
2121
@Transactional
22-
public UserDetails loadUserByUsername(String usernameOrEmail) throws UsernameNotFoundException {
22+
public UserDetails loadUserByUsername(String usernameOrEmail) {
2323
User user = userRepository.findByUsernameOrEmail(usernameOrEmail, usernameOrEmail)
2424
.orElseThrow(() -> new UsernameNotFoundException(String.format("User not found with this username or email: %s", usernameOrEmail)));
2525
return UserPrincipal.create(user);

‎src/main/java/com/sopromadze/blogapi/service/impl/PostServiceImpl.java‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import com.sopromadze.blogapi.exception.UnauthorizedException;
66
import com.sopromadze.blogapi.model.Category;
77
import com.sopromadze.blogapi.model.Post;
8-
import com.sopromadze.blogapi.model.role.RoleName;
98
import com.sopromadze.blogapi.model.Tag;
9+
import com.sopromadze.blogapi.model.role.RoleName;
1010
import com.sopromadze.blogapi.model.user.User;
1111
import com.sopromadze.blogapi.payload.ApiResponse;
1212
import com.sopromadze.blogapi.payload.PagedResponse;
@@ -29,7 +29,6 @@
2929
import org.springframework.stereotype.Service;
3030

3131
import java.util.ArrayList;
32-
import java.util.Arrays;
3332
import java.util.Collections;
3433
import java.util.List;
3534

@@ -39,7 +38,6 @@
3938
import static com.sopromadze.blogapi.utils.AppConstants.POST;
4039
import static com.sopromadze.blogapi.utils.AppConstants.TAG;
4140
import static com.sopromadze.blogapi.utils.AppConstants.USER;
42-
import static com.sopromadze.blogapi.utils.AppConstants.USERNAME;
4341

4442
@Service
4543
public class PostServiceImpl implements PostService {
@@ -72,8 +70,7 @@ public PagedResponse<Post> getAllPosts(int page, int size) {
7270
@Override
7371
public PagedResponse<Post> getPostsByCreatedBy(String username, int page, int size) {
7472
validatePageNumberAndSize(page, size);
75-
User user = userRepository.findByUsername(username)
76-
.orElseThrow(() -> new ResourceNotFoundException(USER, USERNAME, username));
73+
User user = userRepository.getUserByName(username);
7774
Pageable pageable = PageRequest.of(page, size, Sort.Direction.DESC, CREATED_AT);
7875
Page<Post> posts = postRepository.findByCreatedBy(user.getId(), pageable);
7976

@@ -106,7 +103,7 @@ public PagedResponse<Post> getPostsByTag(Long id, int page, int size) {
106103

107104
Pageable pageable = PageRequest.of(page, size, Sort.Direction.DESC, CREATED_AT);
108105

109-
Page<Post> posts = postRepository.findByTags(Arrays.asList(tag), pageable);
106+
Page<Post> posts = postRepository.findByTags(Collections.singletonList(tag), pageable);
110107

111108
List<Post> content = posts.getNumberOfElements() == 0 ? Collections.emptyList() : posts.getContent();
112109

@@ -152,7 +149,7 @@ public PostResponse addPost(PostRequest postRequest, UserPrincipal currentUser)
152149
Category category = categoryRepository.findById(postRequest.getCategoryId())
153150
.orElseThrow(() -> new ResourceNotFoundException(CATEGORY, ID, postRequest.getCategoryId()));
154151

155-
List<Tag> tags = new ArrayList< >(postRequest.getTags().size());
152+
List<Tag> tags = new ArrayList<>(postRequest.getTags().size());
156153

157154
for (String name : postRequest.getTags()) {
158155
Tag tag = tagRepository.findByName(name);
@@ -176,7 +173,7 @@ public PostResponse addPost(PostRequest postRequest, UserPrincipal currentUser)
176173
postResponse.setBody(newPost.getBody());
177174
postResponse.setCategory(newPost.getCategory().getName());
178175

179-
List<String> tagNames = new ArrayList< >(newPost.getTags().size());
176+
List<String> tagNames = new ArrayList<>(newPost.getTags().size());
180177

181178
for (Tag tag : newPost.getTags()) {
182179
tagNames.add(tag.getName());

‎src/main/java/com/sopromadze/blogapi/service/impl/TagServiceImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import com.sopromadze.blogapi.exception.ResourceNotFoundException;
44
import com.sopromadze.blogapi.exception.UnauthorizedException;
5-
import com.sopromadze.blogapi.model.role.RoleName;
65
import com.sopromadze.blogapi.model.Tag;
6+
import com.sopromadze.blogapi.model.role.RoleName;
77
import com.sopromadze.blogapi.payload.ApiResponse;
88
import com.sopromadze.blogapi.payload.PagedResponse;
99
import com.sopromadze.blogapi.repository.TagRepository;
@@ -37,7 +37,7 @@ public PagedResponse<Tag> getAllTags(int page, int size) {
3737

3838
List<Tag> content = tags.getNumberOfElements() == 0 ? Collections.emptyList() : tags.getContent();
3939

40-
return new PagedResponse< >(content, tags.getNumber(), tags.getSize(), tags.getTotalElements(), tags.getTotalPages(), tags.isLast());
40+
return new PagedResponse<>(content, tags.getNumber(), tags.getSize(), tags.getTotalElements(), tags.getTotalPages(), tags.isLast());
4141
}
4242

4343
@Override

0 commit comments

Comments
 (0)