From 1db0e84d891f7eec99e4602b24d65d3e716e3c0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=20=D0=AF=D0=BA=D0=BE?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=B2?= Date: Sun, 12 May 2024 18:20:25 +0400 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=80=D0=BE=D0=B4=D0=B5=20=D0=B2=D1=81?= =?UTF-8?q?=D0=B5=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data.mv.db | Bin 49152 -> 49152 bytes data.trace.db | 108 ++++++++++++++++++ .../demo/games/api/GameController.java | 93 ++++++++++++--- .../com/example/demo/games/api/GameDto.java | 2 +- .../example/demo/games/model/GameEntity.java | 50 ++++---- .../demo/games/service/GameService.java | 7 +- .../com/example/demo/genres/api/GenreDto.java | 15 +-- .../orders/repository/OrderRepository.java | 1 + .../demo/orders/service/OrderService.java | 1 - .../demo/users/api/UserCartController.java | 20 ++-- .../demo/users/api/UserProfileController.java | 22 ++-- src/main/resources/templates/cart.html | 9 +- src/main/resources/templates/default.html | 2 - src/main/resources/templates/game-edit.html | 31 ++++- src/main/resources/templates/orders.html | 14 ++- src/main/resources/templates/profile.html | 2 +- 16 files changed, 291 insertions(+), 86 deletions(-) create mode 100644 data.trace.db diff --git a/data.mv.db b/data.mv.db index ef94f3ebadd0082f26a6811da9b03b48e58174b6..6819e849f31056a0d65973c86ad7564def917182 100644 GIT binary patch literal 49152 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 Uzl&n@SpIM68pr@1iv0io0V>;eM*si- literal 49152 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 KfACQ3|NjqH`7(R} diff --git a/data.trace.db b/data.trace.db new file mode 100644 index 0000000..3b6df68 --- /dev/null +++ b/data.trace.db @@ -0,0 +1,108 @@ +2024-05-12 15:36:55.285977+04:00 database: wrong user or password; user: "SA" +org.h2.message.DbException: Неверное имя пользователя или пароль +Wrong user name or password [28000-224] + at org.h2.message.DbException.get(DbException.java:223) + at org.h2.message.DbException.get(DbException.java:199) + at org.h2.message.DbException.get(DbException.java:188) + at org.h2.engine.Engine.openSession(Engine.java:154) + at org.h2.engine.Engine.openSession(Engine.java:222) + at org.h2.engine.Engine.createSession(Engine.java:201) + at org.h2.engine.SessionRemote.connectEmbeddedOrServer(SessionRemote.java:343) + at org.h2.jdbc.JdbcConnection.(JdbcConnection.java:125) + at org.h2.util.JdbcUtils.getConnection(JdbcUtils.java:288) + at org.h2.server.web.WebServer.getConnection(WebServer.java:811) + at org.h2.server.web.WebApp.login(WebApp.java:1039) + at org.h2.server.web.WebApp.process(WebApp.java:227) + at org.h2.server.web.WebApp.processRequest(WebApp.java:177) + at org.h2.server.web.JakartaWebServlet.doGet(JakartaWebServlet.java:129) + at org.h2.server.web.JakartaWebServlet.doPost(JakartaWebServlet.java:166) + at jakarta.servlet.http.HttpServlet.service(HttpServlet.java:590) + at jakarta.servlet.http.HttpServlet.service(HttpServlet.java:658) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:206) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:150) + at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:51) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:175) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:150) + at org.springframework.web.filter.CompositeFilter$VirtualFilterChain.doFilter(CompositeFilter.java:108) + at org.springframework.security.web.FilterChainProxy.lambda$doFilterInternal$3(FilterChainProxy.java:231) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:365) + at org.springframework.security.web.access.intercept.AuthorizationFilter.doFilter(AuthorizationFilter.java:100) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:374) + at org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:126) + at org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:120) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:374) + at org.springframework.security.web.authentication.AnonymousAuthenticationFilter.doFilter(AnonymousAuthenticationFilter.java:100) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:374) + at org.springframework.security.web.authentication.rememberme.RememberMeAuthenticationFilter.doFilter(RememberMeAuthenticationFilter.java:110) + at org.springframework.security.web.authentication.rememberme.RememberMeAuthenticationFilter.doFilter(RememberMeAuthenticationFilter.java:101) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:374) + at org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter.doFilter(SecurityContextHolderAwareRequestFilter.java:179) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:374) + at org.springframework.security.web.savedrequest.RequestCacheAwareFilter.doFilter(RequestCacheAwareFilter.java:63) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:374) + at org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter.doFilter(AbstractAuthenticationProcessingFilter.java:227) + at org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter.doFilter(AbstractAuthenticationProcessingFilter.java:221) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:374) + at org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:107) + at org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:93) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:374) + at org.springframework.web.filter.CorsFilter.doFilterInternal(CorsFilter.java:91) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:116) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:374) + at org.springframework.security.web.header.HeaderWriterFilter.doHeadersAfter(HeaderWriterFilter.java:90) + at org.springframework.security.web.header.HeaderWriterFilter.doFilterInternal(HeaderWriterFilter.java:75) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:116) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:374) + at org.springframework.security.web.context.SecurityContextHolderFilter.doFilter(SecurityContextHolderFilter.java:82) + at org.springframework.security.web.context.SecurityContextHolderFilter.doFilter(SecurityContextHolderFilter.java:69) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:374) + at org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter.doFilterInternal(WebAsyncManagerIntegrationFilter.java:62) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:116) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:374) + at org.springframework.security.web.session.DisableEncodeUrlFilter.doFilterInternal(DisableEncodeUrlFilter.java:42) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:116) + at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:374) + at org.springframework.security.web.FilterChainProxy.doFilterInternal(FilterChainProxy.java:233) + at org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:191) + at org.springframework.web.filter.CompositeFilter$VirtualFilterChain.doFilter(CompositeFilter.java:113) + at org.springframework.web.servlet.handler.HandlerMappingIntrospector.lambda$createCacheFilter$3(HandlerMappingIntrospector.java:195) + at org.springframework.web.filter.CompositeFilter$VirtualFilterChain.doFilter(CompositeFilter.java:113) + at org.springframework.web.filter.CompositeFilter.doFilter(CompositeFilter.java:74) + at org.springframework.security.config.annotation.web.configuration.WebMvcSecurityConfiguration$CompositeFilterChainProxy.doFilter(WebMvcSecurityConfiguration.java:230) + at org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(DelegatingFilterProxy.java:352) + at org.springframework.web.filter.DelegatingFilterProxy.doFilter(DelegatingFilterProxy.java:268) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:175) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:150) + at org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:116) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:175) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:150) + at org.springframework.web.filter.FormContentFilter.doFilterInternal(FormContentFilter.java:93) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:116) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:175) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:150) + at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201) + at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:116) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:175) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:150) + at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:167) + at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:90) + at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:482) + at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:115) + at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:93) + at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:74) + at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:344) + at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:391) + at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:63) + at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:896) + at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1736) + at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:52) + at org.apache.tomcat.util.threads.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1191) + at org.apache.tomcat.util.threads.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:659) + at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:63) + at java.base/java.lang.Thread.run(Thread.java:1623) +Caused by: org.h2.jdbc.JdbcSQLInvalidAuthorizationSpecException: Неверное имя пользователя или пароль +Wrong user name or password [28000-224] + at org.h2.message.DbException.getJdbcSQLException(DbException.java:522) + at org.h2.message.DbException.getJdbcSQLException(DbException.java:489) + ... 100 more diff --git a/src/main/java/com/example/demo/games/api/GameController.java b/src/main/java/com/example/demo/games/api/GameController.java index e72cc73..f7045ed 100644 --- a/src/main/java/com/example/demo/games/api/GameController.java +++ b/src/main/java/com/example/demo/games/api/GameController.java @@ -6,21 +6,24 @@ import java.util.Map; import org.modelmapper.ModelMapper; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.example.demo.core.api.PageAttributesMapper; import com.example.demo.core.configuration.Constants; import com.example.demo.games.model.GameEntity; import com.example.demo.games.service.GameService; +import com.example.demo.genres.api.GenreDto; import com.example.demo.genres.model.GenreEntity; import com.example.demo.genres.service.GenreService; +import com.example.demo.types.api.TypeDto; +import com.example.demo.types.model.TypeEntity; import com.example.demo.types.service.TypeService; import jakarta.validation.Valid; @@ -60,6 +63,14 @@ public class GameController { return dto; } + private TypeDto toTypeDto(TypeEntity entity) { + return modelMapper.map(entity, TypeDto.class); + } + + private GenreDto toGenreDto(GenreEntity entity) { + return modelMapper.map(entity, GenreDto.class); + } + private GameEntity toEntity(GameDto dto) { // return modelMapper.map(dto, GameEntity.class); final GameEntity entity = modelMapper.map(dto, GameEntity.class); @@ -83,23 +94,75 @@ public class GameController { return GAME_VIEW; } - @GetMapping("/{id}") - public GameDto get(@PathVariable(name = "id") Long id) { - return toDto(gameService.get(id)); + @GetMapping("/edit/") + public String create( + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + Model model) { + model.addAttribute(GAME_ATTRIBUTE, new GameDto()); + model.addAttribute("types", typeService.getAll().stream().map(this::toTypeDto).toList()); + model.addAttribute("genresCheck", genreService.getAll().stream().map(this::toGenreDto).toList()); + model.addAttribute(PAGE_ATTRIBUTE, page); + return GAME_EDIT_VIEW; } - @PostMapping - public GameDto create(@RequestBody @Valid GameDto dto) { - return toDto(gameService.create(toEntity(dto))); + @PostMapping("/edit/") + public String create( + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + @ModelAttribute(name = GAME_ATTRIBUTE) @Valid GameDto game, + BindingResult bindingResult, + Model model, + RedirectAttributes redirectAttributes) { + if (bindingResult.hasErrors()) { + model.addAttribute(PAGE_ATTRIBUTE, page); + return GAME_EDIT_VIEW; + } + redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page); + gameService.create(toEntity(game)); + return Constants.REDIRECT_VIEW + URL; } - @PutMapping("/{id}") - public GameDto update(@PathVariable(name = "id") Long id, @RequestBody GameDto dto) { - return toDto(gameService.update(id, toEntity(dto))); + @GetMapping("/edit/{id}") + public String update( + @PathVariable(name = "id") Long id, + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + Model model) { + if (id <= 0) { + throw new IllegalArgumentException(); + } + model.addAttribute(GAME_ATTRIBUTE, toDto(gameService.get(id))); + model.addAttribute(PAGE_ATTRIBUTE, page); + model.addAttribute("types", typeService.getAll().stream().map(this::toTypeDto).toList()); + model.addAttribute("genresCheck", genreService.getAll().stream().map(this::toGenreDto).toList()); + return GAME_EDIT_VIEW; } - @DeleteMapping("/{id}") - public GameDto delete(@PathVariable(name = "id") Long id) { - return toDto(gameService.delete(id)); + @PostMapping("/edit/{id}") + public String update( + @PathVariable(name = "id") Long id, + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + @ModelAttribute(name = GAME_ATTRIBUTE) @Valid GameDto game, + BindingResult bindingResult, + Model model, + RedirectAttributes redirectAttributes) { + if (bindingResult.hasErrors()) { + model.addAttribute(PAGE_ATTRIBUTE, page); + return GAME_EDIT_VIEW; + } + if (id <= 0) { + throw new IllegalArgumentException(); + } + redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page); + gameService.update(id, toEntity(game)); + return Constants.REDIRECT_VIEW + URL; + } + + @PostMapping("/delete/{id}") + public String delete( + @PathVariable(name = "id") Long id, + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + RedirectAttributes redirectAttributes) { + redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page); + gameService.delete(id); + return Constants.REDIRECT_VIEW + URL; } } diff --git a/src/main/java/com/example/demo/games/api/GameDto.java b/src/main/java/com/example/demo/games/api/GameDto.java index 1a6e39f..a71abb3 100644 --- a/src/main/java/com/example/demo/games/api/GameDto.java +++ b/src/main/java/com/example/demo/games/api/GameDto.java @@ -15,7 +15,7 @@ public class GameDto { @NotNull private final List genres = new ArrayList<>(); @NotNull - @Min(1) + @Min(100) private Double price; @NotBlank private String name; diff --git a/src/main/java/com/example/demo/games/model/GameEntity.java b/src/main/java/com/example/demo/games/model/GameEntity.java index ff75593..a3573b0 100644 --- a/src/main/java/com/example/demo/games/model/GameEntity.java +++ b/src/main/java/com/example/demo/games/model/GameEntity.java @@ -12,12 +12,12 @@ import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToMany; -import jakarta.persistence.OneToOne; +import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; @Entity @Table(name = "games") -public class GameEntity extends BaseEntity{ +public class GameEntity extends BaseEntity { @Column(nullable = false) private String name; @Column(nullable = false) @@ -27,14 +27,14 @@ public class GameEntity extends BaseEntity{ @ManyToMany() @Column(unique = false) private final List genres = new ArrayList<>(); - @OneToOne + @ManyToOne @JoinColumn(name = "typeId", nullable = false, unique = false) private TypeEntity type; - public GameEntity(){ + public GameEntity() { } - public GameEntity(TypeEntity type, String name, Double price, String description, List genres){ + public GameEntity(TypeEntity type, String name, Double price, String description, List genres) { this.type = type; this.name = name; this.price = price; @@ -43,63 +43,67 @@ public class GameEntity extends BaseEntity{ this.genres.addAll(genres); } - public TypeEntity getType(){ + public TypeEntity getType() { return type; } - public void setType(TypeEntity type){ + public void setType(TypeEntity type) { this.type = type; } - public Double getPrice(){ + public Double getPrice() { return price; } - public void setPrice(Double price){ + public void setPrice(Double price) { this.price = price; } - public String getName(){ + public String getName() { return name; } - public void setName(String name){ + public void setName(String name) { this.name = name; } - public String getDescription(){ + public String getDescription() { return description; } - public void setDescription(String description){ + public void setDescription(String description) { this.description = description; } - public List getGenres(){ + public List getGenres() { return genres; } - public void setGenres(GenreEntity genre){ + public void setGenres(GenreEntity genre) { this.genres.add(genre); } + public void delGenres() { + this.genres.clear(); + } + @Override public int hashCode() { return Objects.hash(id, type, price, genres, description, name); } @Override - public boolean equals(Object obj){ - if(this == obj) + public boolean equals(Object obj) { + if (this == obj) return true; - if(obj == null || getClass() != obj.getClass()) + if (obj == null || getClass() != obj.getClass()) return false; final GameEntity other = (GameEntity) obj; return Objects.equals(other.getId(), id) - && Objects.equals(other.getType(), type) - && Objects.equals(other.getPrice(), price) - && Objects.equals(other.getGenres(), genres) - && Objects.equals(other.getDescription(), description) - && Objects.equals(other.getName(), name); + && Objects.equals(other.getType(), type) + && Objects.equals(other.getPrice(), price) + && Objects.equals(other.getGenres(), genres) + && Objects.equals(other.getDescription(), description) + && Objects.equals(other.getName(), name); } } diff --git a/src/main/java/com/example/demo/games/service/GameService.java b/src/main/java/com/example/demo/games/service/GameService.java index 3bafb07..cf79b52 100644 --- a/src/main/java/com/example/demo/games/service/GameService.java +++ b/src/main/java/com/example/demo/games/service/GameService.java @@ -86,8 +86,11 @@ public class GameService { existEntity.setDescription(entity.getDescription()); existEntity.setType(entity.getType()); var genres = entity.getGenres(); - for (var genre : genres) { - existEntity.setGenres(genre); + if (genres.size() != 0) { + existEntity.delGenres(); + for (var genre : genres) { + existEntity.setGenres(genre); + } } return repository.save(existEntity); } diff --git a/src/main/java/com/example/demo/genres/api/GenreDto.java b/src/main/java/com/example/demo/genres/api/GenreDto.java index 5f3c6e0..343b96c 100644 --- a/src/main/java/com/example/demo/genres/api/GenreDto.java +++ b/src/main/java/com/example/demo/genres/api/GenreDto.java @@ -1,30 +1,27 @@ package com.example.demo.genres.api; -import com.fasterxml.jackson.annotation.JsonProperty; - import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; public class GenreDto { - @JsonProperty(access = JsonProperty.Access.READ_ONLY) private Long id; @NotBlank @Size(min = 1, max = 50) private String name; - public Long getId(){ + public Long getId() { return id; } - - public void setId(Long id){ + + public void setId(Long id) { this.id = id; } - public String getName(){ + public String getName() { return name; } - - public void setName(String name){ + + public void setName(String name) { this.name = name; } } diff --git a/src/main/java/com/example/demo/orders/repository/OrderRepository.java b/src/main/java/com/example/demo/orders/repository/OrderRepository.java index 9015a75..fa7cbab 100644 --- a/src/main/java/com/example/demo/orders/repository/OrderRepository.java +++ b/src/main/java/com/example/demo/orders/repository/OrderRepository.java @@ -15,6 +15,7 @@ public interface OrderRepository extends CrudRepository, PagingAndSortingRepository { Optional findOneByUserIdAndId(long userId, long id); + @Query("select o from OrderEntity o join fetch o.games where o.user.id = ?1") List findByUserId(long userId); @Query("select o from OrderEntity o join fetch o.games where o.user.id = ?1") diff --git a/src/main/java/com/example/demo/orders/service/OrderService.java b/src/main/java/com/example/demo/orders/service/OrderService.java index 780152f..ea6f109 100644 --- a/src/main/java/com/example/demo/orders/service/OrderService.java +++ b/src/main/java/com/example/demo/orders/service/OrderService.java @@ -1,7 +1,6 @@ package com.example.demo.orders.service; import java.util.List; -import java.util.stream.StreamSupport; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; diff --git a/src/main/java/com/example/demo/users/api/UserCartController.java b/src/main/java/com/example/demo/users/api/UserCartController.java index 5499f2a..572fb10 100644 --- a/src/main/java/com/example/demo/users/api/UserCartController.java +++ b/src/main/java/com/example/demo/users/api/UserCartController.java @@ -2,9 +2,7 @@ package com.example.demo.users.api; import java.util.Collection; import java.util.List; -import java.util.Map; import java.util.Set; -import java.util.function.Function; import java.util.stream.Collectors; import org.modelmapper.ModelMapper; @@ -43,7 +41,6 @@ public class UserCartController { private final GameService gameService; private final OrderService orderService; private final SessionCart cart; - private final ModelMapper modelMapper; public UserCartController( GameService gameService, @@ -53,7 +50,6 @@ public class UserCartController { this.gameService = gameService; this.orderService = orderService; this.cart = cart; - this.modelMapper = modelMapper; } private GameDto toGameDto(GameEntity entity) { @@ -68,14 +64,14 @@ public class UserCartController { } // private List toGameEntities(Collection dtos){ - // final GameEntity entity = modelMapper.map(dto, GameEntity.class); - // entity.setType(typeService.get(dto.getTypeId())); - // var genres = dto.getGenres(); - // List genresList = genreService.getAllById(genres); - // for (var genre : genresList) { - // entity.setGenres(genre); - // } - // return entity; + // final GameEntity entity = modelMapper.map(dto, GameEntity.class); + // entity.setType(typeService.get(dto.getTypeId())); + // var genres = dto.getGenres(); + // List genresList = genreService.getAllById(genres); + // for (var genre : genresList) { + // entity.setGenres(genre); + // } + // return entity; // } private OrderEntity toOrderEntities(Collection dtos) { diff --git a/src/main/java/com/example/demo/users/api/UserProfileController.java b/src/main/java/com/example/demo/users/api/UserProfileController.java index f480f40..82b5db1 100644 --- a/src/main/java/com/example/demo/users/api/UserProfileController.java +++ b/src/main/java/com/example/demo/users/api/UserProfileController.java @@ -5,7 +5,10 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.example.demo.core.api.PageAttributesMapper; import com.example.demo.core.configuration.Constants; @@ -24,13 +27,9 @@ public class UserProfileController { private static final String PROFILE_VIEW = "profile"; private static final String PAGE_ATTRIBUTE = "page"; - private static final String TYPEID_ATTRIBUTE = "gameId"; - private static final String PROFILE_ATTRIBUTE = "profile"; private final OrderService orderService; private final GameService gameService; - private final UserService userService; - private final ModelMapper modelMapper; public UserProfileController( OrderService orderService, @@ -39,8 +38,6 @@ public class UserProfileController { ModelMapper modelMapper) { this.orderService = orderService; this.gameService = gameService; - this.userService = userService; - this.modelMapper = modelMapper; } private OrderDto toDto(OrderEntity entity) { @@ -64,12 +61,10 @@ public class UserProfileController { @GetMapping public String getProfile( @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, - @RequestParam(name = TYPEID_ATTRIBUTE, defaultValue = "0") int typeId, Model model, @AuthenticationPrincipal UserPrincipal principal) { final long userId = principal.getId(); model.addAttribute(PAGE_ATTRIBUTE, page); - model.addAttribute(TYPEID_ATTRIBUTE, typeId); model.addAllAttributes(PageAttributesMapper.toAttributes( orderService.getAll(userId, page, Constants.DEFAULT_PAGE_SIZE), this::toDto)); @@ -79,4 +74,15 @@ public class UserProfileController { .toList()); return PROFILE_VIEW; } + + @PostMapping("/delete/{id}") + public String deleteOrder( + @PathVariable(name = "id") Long id, + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + RedirectAttributes redirectAttributes, + @AuthenticationPrincipal UserPrincipal principal) { + redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page); + orderService.delete(principal.getId(), id); + return Constants.REDIRECT_VIEW + "/"; + } } diff --git a/src/main/resources/templates/cart.html b/src/main/resources/templates/cart.html index a19c372..c595b07 100644 --- a/src/main/resources/templates/cart.html +++ b/src/main/resources/templates/cart.html @@ -17,12 +17,15 @@ -

+
-
- [[${cartItem.gameName}]] +
+ Название: [[${cartItem.gameName}]]
+
+ Цена: [[${cartItem.Price}]] +
diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html index 2be9f25..0e7b41c 100644 --- a/src/main/resources/templates/default.html +++ b/src/main/resources/templates/default.html @@ -47,8 +47,6 @@ Консоль H2 - Ошибка 1 - Ошибка 2
    diff --git a/src/main/resources/templates/game-edit.html b/src/main/resources/templates/game-edit.html index 9c4353f..4beff22 100644 --- a/src/main/resources/templates/game-edit.html +++ b/src/main/resources/templates/game-edit.html @@ -7,7 +7,7 @@
    - +
    @@ -18,16 +18,37 @@
    - - -
    +
    +
    + +
    + + +
    +
    +
    + + +
    +
    +
    + + +
    +
    - Отмена + Отмена
    diff --git a/src/main/resources/templates/orders.html b/src/main/resources/templates/orders.html index 8a5340c..e7b57cd 100644 --- a/src/main/resources/templates/orders.html +++ b/src/main/resources/templates/orders.html @@ -2,7 +2,7 @@ - +

    Данные отсутствуют

    @@ -26,11 +26,18 @@ Название игры + Цена - - + + + + + + + + @@ -38,7 +45,6 @@
    -
    diff --git a/src/main/resources/templates/profile.html b/src/main/resources/templates/profile.html index 57e7454..02f7a1d 100644 --- a/src/main/resources/templates/profile.html +++ b/src/main/resources/templates/profile.html @@ -16,7 +16,7 @@
    + th:replace="~{ orders :: orders (items=${items}, totalPages=${totalPages}, currentPage=${currentPage}, games=${games})}" />