From d8c8f70ebd9d7a6f42d64479a603a31eafb5b22e Mon Sep 17 00:00:00 2001 From: Artur Kmieckowiak Date: Tue, 25 Feb 2020 10:23:13 +0100 Subject: [PATCH] Cleanup --- .gitignore | 1 + .../amu/wmi/bookapi/api/BookController.java | 2 +- .../wmi/bookapi/api/SecurityInterceptor.java | 26 ------------------- .../wmi/bookapi/api/dto/PatchBookRequest.java | 4 --- .../MessageCustomRepositoryImpl.java | 2 +- .../security/JWTAuthenticationFilter.java | 2 +- .../amu/wmi/bookapi/security/WebSecurity.java | 1 - .../amu/wmi/bookapi/service/BookService.java | 4 +-- .../wmi/bookapi/service/MessageService.java | 10 ++++++- src/main/resources/application.properties | 2 ++ 10 files changed, 17 insertions(+), 37 deletions(-) delete mode 100644 src/main/java/pl/edu/amu/wmi/bookapi/api/SecurityInterceptor.java delete mode 100644 src/main/java/pl/edu/amu/wmi/bookapi/api/dto/PatchBookRequest.java diff --git a/.gitignore b/.gitignore index 2e0c967..89761bd 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ ### Spring initialzr HELP.md +.DS_Store ### Intellij ### # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm diff --git a/src/main/java/pl/edu/amu/wmi/bookapi/api/BookController.java b/src/main/java/pl/edu/amu/wmi/bookapi/api/BookController.java index cddf839..e1a4477 100644 --- a/src/main/java/pl/edu/amu/wmi/bookapi/api/BookController.java +++ b/src/main/java/pl/edu/amu/wmi/bookapi/api/BookController.java @@ -75,7 +75,7 @@ public class BookController { @RequestParam("file") MultipartFile imageFile, @RequestParam("author") String author, @RequestParam("title") String title) throws Exception { - bookService.handleImageUpload(imageFile, author, title); + bookService.handleImageUpload(imageFile, author, title, getUserName()); return ResponseEntity.ok().build(); } diff --git a/src/main/java/pl/edu/amu/wmi/bookapi/api/SecurityInterceptor.java b/src/main/java/pl/edu/amu/wmi/bookapi/api/SecurityInterceptor.java deleted file mode 100644 index 0afdced..0000000 --- a/src/main/java/pl/edu/amu/wmi/bookapi/api/SecurityInterceptor.java +++ /dev/null @@ -1,26 +0,0 @@ -package pl.edu.amu.wmi.bookapi.api; - -import org.springframework.stereotype.Component; -import org.springframework.web.servlet.HandlerInterceptor; -import org.springframework.web.servlet.ModelAndView; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -@Component -public class SecurityInterceptor implements HandlerInterceptor { - @Override - public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - return false; - } - - @Override - public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception { - - } - - @Override - public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception { - - } -} diff --git a/src/main/java/pl/edu/amu/wmi/bookapi/api/dto/PatchBookRequest.java b/src/main/java/pl/edu/amu/wmi/bookapi/api/dto/PatchBookRequest.java deleted file mode 100644 index a6d3433..0000000 --- a/src/main/java/pl/edu/amu/wmi/bookapi/api/dto/PatchBookRequest.java +++ /dev/null @@ -1,4 +0,0 @@ -package pl.edu.amu.wmi.bookapi.api.dto; - -public class PatchBookRequest { -} diff --git a/src/main/java/pl/edu/amu/wmi/bookapi/repositories/MessageCustomRepositoryImpl.java b/src/main/java/pl/edu/amu/wmi/bookapi/repositories/MessageCustomRepositoryImpl.java index d44f501..5791fcb 100644 --- a/src/main/java/pl/edu/amu/wmi/bookapi/repositories/MessageCustomRepositoryImpl.java +++ b/src/main/java/pl/edu/amu/wmi/bookapi/repositories/MessageCustomRepositoryImpl.java @@ -24,7 +24,7 @@ public class MessageCustomRepositoryImpl implements MessageCustomRepository { ) ); - Sort sort = Sort.by(Sort.Direction.DESC, "createdAt"); + Sort sort = Sort.by(Sort.Direction.ASC, "createdAt"); return mongoTemplate.find(query.with(sort), MessageDocument.class); } diff --git a/src/main/java/pl/edu/amu/wmi/bookapi/security/JWTAuthenticationFilter.java b/src/main/java/pl/edu/amu/wmi/bookapi/security/JWTAuthenticationFilter.java index b2c9f2c..bacc2c1 100644 --- a/src/main/java/pl/edu/amu/wmi/bookapi/security/JWTAuthenticationFilter.java +++ b/src/main/java/pl/edu/amu/wmi/bookapi/security/JWTAuthenticationFilter.java @@ -29,7 +29,7 @@ public class JWTAuthenticationFilter extends UsernamePasswordAuthenticationFilte } public static final String SECRET = "SecretKeyToGenJWTs"; - public static final long EXPIRATION_TIME = 864_000_000; // 10 days + public static final long EXPIRATION_TIME = 864_000_000; public static final String TOKEN_PREFIX = "Bearer "; public static final String HEADER_STRING = "Authorization"; public static final String SIGN_UP_URL = "/users/sign-up"; diff --git a/src/main/java/pl/edu/amu/wmi/bookapi/security/WebSecurity.java b/src/main/java/pl/edu/amu/wmi/bookapi/security/WebSecurity.java index 41ba8a8..336bee3 100644 --- a/src/main/java/pl/edu/amu/wmi/bookapi/security/WebSecurity.java +++ b/src/main/java/pl/edu/amu/wmi/bookapi/security/WebSecurity.java @@ -48,7 +48,6 @@ public class WebSecurity extends WebSecurityConfigurerAdapter { } private JWTAuthenticationFilter getConfiguredJwtAuthenticationFilter() throws Exception{ - System.out.println("JWT Auth"); JWTAuthenticationFilter jwtFilter = new JWTAuthenticationFilter(authenticationManager()); jwtFilter.setFilterProcessesUrl("/users/login"); diff --git a/src/main/java/pl/edu/amu/wmi/bookapi/service/BookService.java b/src/main/java/pl/edu/amu/wmi/bookapi/service/BookService.java index 697b9e5..1c87865 100644 --- a/src/main/java/pl/edu/amu/wmi/bookapi/service/BookService.java +++ b/src/main/java/pl/edu/amu/wmi/bookapi/service/BookService.java @@ -34,9 +34,9 @@ public class BookService { bookRepository.save(BookDocument.from(userName, bookDto)); } - public void handleImageUpload(MultipartFile imageFile, String author, String title) throws Exception { + public void handleImageUpload(MultipartFile imageFile, String author, String title, String username) throws Exception { String detectedEan = imageProcessingService.getDecodedEan(imageFile); - saveBook(author, new BookDto(detectedEan, author, title)); + saveBook(username, new BookDto(detectedEan, author, title)); if (detectedEan.isEmpty()) { throw new NoEanCodeDetectedException(); } diff --git a/src/main/java/pl/edu/amu/wmi/bookapi/service/MessageService.java b/src/main/java/pl/edu/amu/wmi/bookapi/service/MessageService.java index a409904..6ea5855 100644 --- a/src/main/java/pl/edu/amu/wmi/bookapi/service/MessageService.java +++ b/src/main/java/pl/edu/amu/wmi/bookapi/service/MessageService.java @@ -10,6 +10,7 @@ import pl.edu.amu.wmi.bookapi.repositories.ThreadRepository; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; @Service public class MessageService { @@ -28,7 +29,14 @@ public class MessageService { } public List getThreads(String user) { - return threadRepository.findByParticipant(user); + List threads = threadRepository.findByParticipant(user); + return threads + .stream() + .map(it -> { + it.getParticipantsIds().remove(user); + return it; + }) + .collect(Collectors.toList()); } public List getMessagesInThread(String threadId, String userId) { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 4ea2219..d06ac7c 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1 +1,3 @@ imgproc.debug = true +spring.servlet.multipart.max-file-size=3MB +spring.servlet.multipart.max-request-size=3MB \ No newline at end of file