Merge pull request #4 from SlimusMinus/start_posts

added get and create post
This commit is contained in:
SlimusMinus
2026-05-07 01:11:12 +03:00
committed by GitHub
4 changed files with 27 additions and 67 deletions

View File

@@ -3,10 +3,12 @@ package com.krylov.refound.controller;
import com.krylov.refound.dto.PostFilter; import com.krylov.refound.dto.PostFilter;
import com.krylov.refound.dto.PostRequest; import com.krylov.refound.dto.PostRequest;
import com.krylov.refound.dto.PostResponse; import com.krylov.refound.dto.PostResponse;
import com.krylov.refound.entity.Post;
import com.krylov.refound.repository.PostRepository; import com.krylov.refound.repository.PostRepository;
import com.krylov.refound.service.PostService; import com.krylov.refound.service.PostService;
import java.util.List; import java.util.List;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
@@ -24,18 +26,20 @@ import org.springframework.web.multipart.MultipartFile;
@RestController @RestController
@RequestMapping("/api/v1/posts") @RequestMapping("/api/v1/posts")
@RequiredArgsConstructor @RequiredArgsConstructor
@Slf4j
public class PostController { public class PostController {
private final PostService service; private final PostService service;
@PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE) @PostMapping
public PostResponse create(@RequestPart("data") PostRequest request, @RequestPart(value = "files", required = false) List<MultipartFile> files) { public PostRequest create(@RequestBody PostRequest request) {
return service.create(request, files); log.info(request.toString());
return service.create(request);
} }
@GetMapping @GetMapping
public Page<PostResponse> getFeed(PostFilter filter, Pageable pageable) { public List<Post> getFeed() {
return service.getFeed(filter, pageable); return service.getFeed();
} }
@PutMapping("/{id}") @PutMapping("/{id}")

View File

@@ -1,5 +1,6 @@
package com.krylov.refound.dto; package com.krylov.refound.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.krylov.refound.enums.PostType; import com.krylov.refound.enums.PostType;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
@@ -18,8 +19,5 @@ public class PostRequest {
private String category; private String category;
@NotBlank private String phone;
private String city;
private String district;
} }

View File

@@ -1,6 +1,13 @@
package com.krylov.refound.enums; package com.krylov.refound.enums;
import com.fasterxml.jackson.annotation.JsonCreator;
public enum PostType { public enum PostType {
LOST, LOSS,
FOUND FOUND;
@JsonCreator
public static PostType from(String value) {
return PostType.valueOf(value.toUpperCase());
}
} }

View File

@@ -39,69 +39,21 @@ public class PostService {
private final FavoriteRepository favoriteRepository; private final FavoriteRepository favoriteRepository;
@CacheEvict(value = "posts", allEntries = true) @CacheEvict(value = "posts", allEntries = true)
public PostResponse create(PostRequest request, List<MultipartFile> files) { public PostRequest create(PostRequest request) {
User user = userService.getCurrentUser();
// User user = userService.getCurrentUser();
//
Post post = mapper.toEntity(request); Post post = mapper.toEntity(request);
post.setCreatedAt(LocalDateTime.now()); post.setCreatedAt(LocalDateTime.now());
post.setStatus(PostStatus.ACTIVE); post.setStatus(PostStatus.ACTIVE);
post.setUser(user);
Post savedPost = repository.save(post); Post savedPost = repository.save(post);
if (files != null) { return request;
for (MultipartFile file : files) {
String url = storageService.save(file);
Image image = new Image();
image.setUrl(url);
image.setPost(savedPost);
imageRepository.save(image);
}
} }
return mapper.toResponse(savedPost); public List<Post> getFeed() {
} return repository.findAll();
@Cacheable(value = "posts", key = "#filter.toString() + '_' + #pageable.pageNumber")
public Page<PostResponse> getFeed(PostFilter filter, Pageable pageable) {
User user = userService.getCurrentUser();
Page<Post> posts;
if (filter.getLat() != null) {
posts = repository.searchWithGeo(
filter.getType() != null ? filter.getType().name() : null,
filter.getCity(),
filter.getCategory(),
filter.getLat(),
filter.getLng(),
filter.getRadius(),
pageable
);
} else {
posts = repository.findAll(PostSpecification.withFilter(filter), pageable);
}
// 🔥 собираем id всех постов
List<Long> postIds = posts.getContent()
.stream()
.map(Post::getId)
.toList();
// 🔥 одним запросом получаем избранные
Set<Long> favoriteIds = new HashSet<>(
favoriteRepository.findFavoritePostIds(user.getId(), postIds)
);
return posts.map(post -> {
PostResponse response = mapper.toResponse(post);
response.setFavorite(favoriteIds.contains(post.getId()));
return response;
});
} }
@Cacheable(value = "post", key = "#id") @Cacheable(value = "post", key = "#id")
@@ -125,8 +77,7 @@ public class PostService {
post.setTitle(request.getTitle()); post.setTitle(request.getTitle());
post.setDescription(request.getDescription()); post.setDescription(request.getDescription());
post.setCategory(request.getCategory()); post.setCategory(request.getCategory());
post.setCity(request.getCity());
post.setDistrict(request.getDistrict());
post.setType(request.getType()); post.setType(request.getType());
Post updated = repository.save(post); Post updated = repository.save(post);