diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/.gitignore b/semestr_2/Lab. 4 + 5/qpick-shop/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/build.gradle b/semestr_2/Lab. 4 + 5/qpick-shop/build.gradle new file mode 100644 index 0000000..f8e3f64 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/build.gradle @@ -0,0 +1,40 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.2.3' + id 'io.spring.dependency-management' version '1.1.4' +} + +group = 'com.example' +version = '0.0.1-SNAPSHOT' + +java { + sourceCompatibility = '17' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.modelmapper:modelmapper:3.2.0' + + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'com.h2database:h2:2.2.224' + + implementation 'org.springframework.boot:spring-boot-devtools' + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.3.0' + runtimeOnly 'org.webjars.npm:bootstrap:5.3.3' + runtimeOnly 'org.webjars.npm:bootstrap-icons:1.11.3' + + implementation 'org.springframework.boot:spring-boot-starter-security' + implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +tasks.named('test') { + useJUnitPlatform() +} \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/data.mv.db b/semestr_2/Lab. 4 + 5/qpick-shop/data.mv.db new file mode 100644 index 0000000..2a2af3c Binary files /dev/null and b/semestr_2/Lab. 4 + 5/qpick-shop/data.mv.db differ diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/data.trace.db b/semestr_2/Lab. 4 + 5/qpick-shop/data.trace.db new file mode 100644 index 0000000..de4b710 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/data.trace.db @@ -0,0 +1,398 @@ +2024-04-24 15:12:26.126550+04:00 database: wrong user or password; user: "ROOT" +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:205) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:51) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:1744) + 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:842) +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) + ... 50 more +2024-04-24 15:34:08.642575+04:00 database: wrong user or password; user: "ROOT" +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:205) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:51) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:1744) + 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:842) +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) + ... 50 more +2024-04-24 15:34:12.038696+04:00 database: wrong user or password; user: "ROOT" +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:205) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:51) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:1744) + 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:842) +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) + ... 50 more +2024-04-24 15:34:29.885829+04:00 database: wrong user or password; user: "ROOT" +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:205) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:51) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:1744) + 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:842) +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) + ... 50 more +2024-04-25 18:00:43.384378+04:00 database: wrong user or password; user: "ROOT" +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:205) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:51) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:1744) + 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:842) +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) + ... 50 more +2024-05-08 20:37:35.208278+04:00 database: wrong user or password; user: "ROOT" +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:205) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:51) + at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:174) + at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:149) + 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:1744) + 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:842) +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/semestr_2/Lab. 4 + 5/qpick-shop/gradle/wrapper/gradle-wrapper.jar b/semestr_2/Lab. 4 + 5/qpick-shop/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d64cd49 Binary files /dev/null and b/semestr_2/Lab. 4 + 5/qpick-shop/gradle/wrapper/gradle-wrapper.jar differ diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/gradle/wrapper/gradle-wrapper.properties b/semestr_2/Lab. 4 + 5/qpick-shop/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/gradlew b/semestr_2/Lab. 4 + 5/qpick-shop/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/gradlew.bat b/semestr_2/Lab. 4 + 5/qpick-shop/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/index.html b/semestr_2/Lab. 4 + 5/qpick-shop/index.html new file mode 100644 index 0000000..3191a87 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/index.html @@ -0,0 +1,64 @@ + + + + + + + Document + + + +

Push the button

+ +
+ +
+ +
+ +
+ + + + + \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/settings.gradle b/semestr_2/Lab. 4 + 5/qpick-shop/settings.gradle new file mode 100644 index 0000000..82cfb67 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'qpick-shop' diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/QpickShopApplication.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/QpickShopApplication.java new file mode 100644 index 0000000..d5641cd --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/QpickShopApplication.java @@ -0,0 +1,61 @@ +package com.example.qpickshop; + + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +import com.example.qpickshop.categories.model.CategoryEntity; +import com.example.qpickshop.categories.service.CategoryService; +import com.example.qpickshop.favouriteProducts.model.FavouriteProductEntity; +import com.example.qpickshop.favouriteProducts.service.FavouriteProductService; +import com.example.qpickshop.products.model.ProductEntity; +import com.example.qpickshop.products.service.ProductService; +import com.example.qpickshop.users.model.UserEntity; +import com.example.qpickshop.users.model.UserRole; +import com.example.qpickshop.users.service.UserService; + +@SpringBootApplication +public class QpickShopApplication implements CommandLineRunner { + private final Logger log = LoggerFactory.getLogger(QpickShopApplication.class); + private final CategoryService categoryService; + private final UserService userService; + private final ProductService productService; + private final FavouriteProductService favouriteProductService; + + public static void main(String[] args) { + SpringApplication.run(QpickShopApplication.class, args); + } + + public QpickShopApplication(FavouriteProductService favouriteProductService, CategoryService categoryService, + UserService userService, ProductService productService) { + this.categoryService = categoryService; + this.userService = userService; + this.productService = productService; + this.favouriteProductService = favouriteProductService; + } + + @Override + public void run(String... args) throws Exception { + userService.create(new UserEntity("email1", "password")); + userService.create(new UserEntity("email2", "password")); + userService.create(new UserEntity("email3", "password")); + userService.create(new UserEntity("email4", "password")); + userService.create(new UserEntity("email5", "password")); + userService.create(new UserEntity("email6", "password")); + + final var category = categoryService.create(new CategoryEntity("Телефоны")); + final var product = productService.create(new ProductEntity("IPhone 12", category, "descr", 22.2, 2.1)); + productService.create(new ProductEntity("IPhone 13", category, "descr", 22.2, 2.1)); + + final var admin = new UserEntity("admin", "admin"); + admin.setRole(UserRole.ADMIN); + userService.create(admin); + + FavouriteProductEntity fpe = new FavouriteProductEntity(); + fpe.setProduct(product); + favouriteProductService.create(fpe, admin.getId()); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/cartItems/api/CartItemController.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/cartItems/api/CartItemController.java new file mode 100644 index 0000000..2c4aff3 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/cartItems/api/CartItemController.java @@ -0,0 +1,115 @@ +package com.example.qpickshop.cartItems.api; + +import org.modelmapper.ModelMapper; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +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.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import com.example.qpickshop.cartItems.model.CartItemEntity; +import com.example.qpickshop.cartItems.service.CartItemService; +import com.example.qpickshop.core.configuration.Constants; +import com.example.qpickshop.core.security.UserPrincipal; +import com.example.qpickshop.orders.service.OrderService; +import com.example.qpickshop.products.api.ProductDto; +import com.example.qpickshop.products.model.ProductEntity; +import com.example.qpickshop.products.service.ProductService; + +import jakarta.validation.Valid; + +@Controller +@RequestMapping(CartItemController.URL) +public class CartItemController { + public static final String URL = "/cart"; + private static final String ORDER_VIEW = "cart"; + private static final String CART_ITEM_ATTRIBUTE = "cartItem"; + private static final String CART_ATTRIBUTE = "cart"; + + private final OrderService orderService; + private final ProductService productService; + private final CartItemService cartItemService; + private final ModelMapper modelMapper; + + public CartItemController(ProductService productService, CartItemService cartItemService, OrderService orderService, + ModelMapper modelMapper) { + this.productService = productService; + this.orderService = orderService; + this.modelMapper = modelMapper; + this.cartItemService = cartItemService; + } + + private ProductDto toProductDto(ProductEntity entity) { + return modelMapper.map(entity, ProductDto.class); + } + + private CartItemEntity toCartItemEntity(CartItemDto dto) { + CartItemEntity entity = modelMapper.map(dto, CartItemEntity.class); + entity.setProduct(productService.get(dto.getProductId())); + return entity; + } + + private CartItemDto toDto(CartItemEntity entity) { + CartItemDto dto = modelMapper.map(entity, CartItemDto.class); + ProductEntity product = productService.get(dto.getProductId()); + dto.setProductName(product.getName()); + dto.setProductPrice(product.getPrice()); + return dto; + } + + @GetMapping + public String getCart(Model model, @AuthenticationPrincipal UserPrincipal principal) { + model.addAttribute("products", + productService.getAll(0L).stream() + .map(this::toProductDto) + .toList()); + model.addAttribute(CART_ITEM_ATTRIBUTE, new CartItemDto()); + model.addAttribute(CART_ATTRIBUTE, cartItemService.getAll(principal.getId()).stream().map(this::toDto) + .toList()); + return ORDER_VIEW; + } + + @PostMapping + public String addItemToCart( + @ModelAttribute(name = CART_ITEM_ATTRIBUTE) @Valid CartItemDto cartItem, + BindingResult bindingResult, + @AuthenticationPrincipal UserPrincipal principal, + Model model) { + if (bindingResult.hasErrors()) { + return ORDER_VIEW; + } + + cartItemService.create(toCartItemEntity(cartItem), principal.getId()); + return Constants.REDIRECT_VIEW + URL; + } + + @PostMapping("/save") + public String createOrder( + Model model, + @AuthenticationPrincipal UserPrincipal principal) { + orderService.create(principal.getId()); + return Constants.REDIRECT_VIEW + "/"; + } + + @PostMapping("/clear") + public String clearCart(@AuthenticationPrincipal UserPrincipal principal) { + cartItemService.clearCart(principal.getId()); + return Constants.REDIRECT_VIEW + URL; + } + + @PostMapping("/toggle-quantity") + public String increaseCartCount( + @RequestParam(name = "id", defaultValue = "0") Long id, + @RequestParam(name = "isIncrease", defaultValue = "false") boolean isIncrease, + @AuthenticationPrincipal UserPrincipal principal) { + if (id <= 0) { + throw new IllegalArgumentException(); + } + cartItemService.update(id, principal.getId(), isIncrease); + return Constants.REDIRECT_VIEW + URL; + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/cartItems/api/CartItemDto.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/cartItems/api/CartItemDto.java new file mode 100644 index 0000000..a1e4f5c --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/cartItems/api/CartItemDto.java @@ -0,0 +1,76 @@ +package com.example.qpickshop.cartItems.api; + +import java.util.Objects; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; + +public class CartItemDto { + private Long id; + + @NotNull + @Min(1) + private Long productId; + + @NotNull + @Min(1) + private Integer quantity; + + private String productName; + private Double productPrice; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getProductId() { + return productId; + } + + public void setProductId(Long productId) { + this.productId = productId; + } + + public Integer getQuantity() { + return quantity; + } + + public void setQuantity(Integer quantity) { + this.quantity = quantity; + } + + public String getProductName() { + return productName; + } + + public void setProductName(String name) { + this.productName = name; + } + + public Double getProductPrice() { + return productPrice; + } + + public void setProductPrice(Double price) { + this.productPrice = price; + } + + @Override + public int hashCode() { + return Objects.hash(productId); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + CartItemDto other = (CartItemDto) obj; + return Objects.equals(productId, other.productId) && Objects.equals(quantity, other.quantity); + } +} \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/cartItems/model/CartItemEntity.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/cartItems/model/CartItemEntity.java new file mode 100644 index 0000000..ec51781 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/cartItems/model/CartItemEntity.java @@ -0,0 +1,80 @@ +package com.example.qpickshop.cartItems.model; + +import java.util.Objects; + +import com.example.qpickshop.core.model.BaseEntity; +import com.example.qpickshop.products.model.ProductEntity; +import com.example.qpickshop.users.model.UserEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; + +@Entity +@Table(name = "cartItems") +public class CartItemEntity extends BaseEntity { + @ManyToOne + @JoinColumn(name = "userId", nullable = false) + private UserEntity user; + @ManyToOne + @JoinColumn(name = "productId", nullable = false) + private ProductEntity product; + @Column(nullable = false) + private Integer quantity; + + public CartItemEntity() { + } + + public CartItemEntity(UserEntity user, ProductEntity product, Integer quantity) { + this.user = user; + this.product = product; + this.quantity = quantity; + } + + public UserEntity getUser() { + return user; + } + + public void setUser(UserEntity user) { + this.user = user; + if (!user.getCartItems().contains(this)) { + user.getCartItems().add(this); + } + } + + public ProductEntity getProduct() { + return product; + } + + public void setProduct(ProductEntity product) { + this.product = product; + } + + public Integer getQuantity() { + return quantity; + } + + public void setQuantity(Integer quantity) { + this.quantity = quantity; + } + + @Override + public int hashCode() { + return Objects.hash(id, user, product, quantity); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final CartItemEntity other = (CartItemEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getUser(), user) + && Objects.equals(other.getProduct(), product) + && Objects.equals(other.getQuantity(), quantity); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/cartItems/repository/CartItemRepository.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/cartItems/repository/CartItemRepository.java new file mode 100644 index 0000000..d55daea --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/cartItems/repository/CartItemRepository.java @@ -0,0 +1,19 @@ +package com.example.qpickshop.cartItems.repository; + +import java.util.List; +import java.util.Optional; + +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.query.Param; + +import com.example.qpickshop.cartItems.model.CartItemEntity; + +public interface CartItemRepository extends CrudRepository { + List findAllByUserId(long userId); + + Optional findByUserIdAndId(long userId, long id); + + @Query("SELECT COALESCE(SUM(ci.product.price * ci.quantity), 0) FROM CartItemEntity ci WHERE ci.user.id = :userId") + Double getTotalPriceByUserId(@Param("userId") Long userId); +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/cartItems/service/CartItemService.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/cartItems/service/CartItemService.java new file mode 100644 index 0000000..1bdae12 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/cartItems/service/CartItemService.java @@ -0,0 +1,74 @@ +package com.example.qpickshop.cartItems.service; + +import java.util.List; + +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.qpickshop.cartItems.model.CartItemEntity; +import com.example.qpickshop.cartItems.repository.CartItemRepository; +import com.example.qpickshop.core.error.NotFoundException; +import com.example.qpickshop.users.service.UserService; + +@Service +public class CartItemService { + private final UserService userService; + private final CartItemRepository repository; + + public CartItemService(UserService userService, CartItemRepository repository) { + this.userService = userService; + this.repository = repository; + } + + @Transactional(readOnly = true) + public List getAll(Long userId) { + userService.get(userId); + return repository.findAllByUserId(userId); + } + + @Transactional(readOnly = true) + public CartItemEntity get(Long userId, Long id) { + userService.get(userId); + return repository.findByUserIdAndId(userId, id) + .orElseThrow(() -> new NotFoundException(CartItemEntity.class, id)); + } + + @Transactional + public CartItemEntity create(CartItemEntity entity, Long userId) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + + entity.setUser(userService.get(userId)); + return repository.save(entity); + } + + @Transactional + public CartItemEntity update(Long id, Long userId, boolean isIncrease) { + final CartItemEntity existsEntity = get(userId, id); + final Integer newQuantity = isIncrease ? existsEntity.getQuantity() + 1 : existsEntity.getQuantity() - 1; + if (newQuantity <= 0) { + return delete(userId, id); + } + existsEntity.setQuantity(newQuantity); + return repository.save(existsEntity); + } + + @Transactional + public CartItemEntity delete(Long userId, Long id) { + final CartItemEntity existsEntity = get(userId, id); + repository.delete(existsEntity); + return existsEntity; + } + + @Transactional + public void clearCart(Long userId) { + final List list = getAll(userId); + list.forEach(item -> delete(userId, item.getId())); + } + + @Transactional(readOnly = true) + public Double getTotal(Long userId) { + return repository.getTotalPriceByUserId(userId); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/categories/api/CategoryController.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/categories/api/CategoryController.java new file mode 100644 index 0000000..7b24e72 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/categories/api/CategoryController.java @@ -0,0 +1,110 @@ +package com.example.qpickshop.categories.api; + +import java.util.Map; + +import org.modelmapper.ModelMapper; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +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.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import com.example.qpickshop.core.api.PageAttributesMapper; +import com.example.qpickshop.core.configuration.Constants; +import com.example.qpickshop.categories.model.CategoryEntity; +import com.example.qpickshop.categories.service.CategoryService; + +import jakarta.validation.Valid; + +@Controller +@RequestMapping(CategoryController.URL) +public class CategoryController { + public static final String URL = Constants.ADMIN_PREFIX + "/category"; + public static final String CATEGORY_VIEW = "category"; + public static final String CATEGORY_EDIT_VIEW = "category-edit"; + public static final String CATEGORY_ATTRIBUTE = "category"; + private static final String PAGE_ATTRIBUTE = "page"; + + private final CategoryService categoryService; + private final ModelMapper modelMapper; + + public CategoryController(CategoryService categoryService, ModelMapper modelMapper) { + this.categoryService = categoryService; + this.modelMapper = modelMapper; + } + + private CategoryDto toDto(CategoryEntity entity) { + return modelMapper.map(entity, CategoryDto.class); + } + + private CategoryEntity toEntity(CategoryDto dto) { + return modelMapper.map(dto, CategoryEntity.class); + } + + @GetMapping + public String getAll( + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + Model model) { + final Map attributes = PageAttributesMapper.toAttributes( + categoryService.getAll(page, Constants.DEFAULT_PAGE_SIZE), this::toDto); + model.addAllAttributes(attributes); + model.addAttribute(PAGE_ATTRIBUTE, page); + return CATEGORY_VIEW; + } + + @GetMapping("/edit/") + public String create(Model model) { + model.addAttribute(CATEGORY_ATTRIBUTE, new CategoryDto()); + return CATEGORY_EDIT_VIEW; + } + + @PostMapping("/edit/") + public String create( + @ModelAttribute(name = CATEGORY_ATTRIBUTE) @Valid CategoryDto category, + BindingResult bindingResult, + Model model) { + if (bindingResult.hasErrors()) { + return CATEGORY_EDIT_VIEW; + } + + categoryService.create(toEntity(category)); + return Constants.REDIRECT_VIEW + URL; + } + + @GetMapping("/edit/{id}") + public String update(@PathVariable(name = "id") Long id, Model model) { + if (id <= 0) { + throw new IllegalArgumentException(); + } + model.addAttribute(CATEGORY_ATTRIBUTE, toDto(categoryService.get(id))); + return CATEGORY_EDIT_VIEW; + } + + @PostMapping("/edit/{id}") + public String update( + @PathVariable(name = "id") Long id, + @ModelAttribute(name = CATEGORY_ATTRIBUTE) @Valid CategoryDto category, + BindingResult bindingResult, + Model model) { + if (bindingResult.hasErrors()) { + return CATEGORY_EDIT_VIEW; + } + if (id <= 0) { + throw new IllegalArgumentException(); + } + + categoryService.update(id, toEntity(category)); + return Constants.REDIRECT_VIEW + URL; + } + + @PostMapping("/delete/{id}") + public String delete( + @PathVariable(name = "id") Long id) { + categoryService.delete(id); + return Constants.REDIRECT_VIEW + URL; + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/categories/api/CategoryDto.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/categories/api/CategoryDto.java new file mode 100644 index 0000000..b269fb6 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/categories/api/CategoryDto.java @@ -0,0 +1,25 @@ +package com.example.qpickshop.categories.api; + +import jakarta.validation.constraints.NotBlank; + +public class CategoryDto { + private Long id; + @NotBlank + private String name; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/categories/model/CategoryEntity.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/categories/model/CategoryEntity.java new file mode 100644 index 0000000..e079c82 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/categories/model/CategoryEntity.java @@ -0,0 +1,47 @@ +package com.example.qpickshop.categories.model; + +import java.util.Objects; + +import com.example.qpickshop.core.model.BaseEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; + +@Entity +@Table(name = "categories") +public class CategoryEntity extends BaseEntity { + @Column(nullable = false, unique = true, length = 50) + private String name; + + public CategoryEntity() { + } + + public CategoryEntity(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public int hashCode() { + return Objects.hash(id, name); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final CategoryEntity other = (CategoryEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getName(), name); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/categories/repository/CategoryRepository.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/categories/repository/CategoryRepository.java new file mode 100644 index 0000000..6dd1239 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/categories/repository/CategoryRepository.java @@ -0,0 +1,12 @@ +package com.example.qpickshop.categories.repository; + +import java.util.Optional; + +import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.PagingAndSortingRepository; + +import com.example.qpickshop.categories.model.CategoryEntity; + +public interface CategoryRepository extends CrudRepository, PagingAndSortingRepository { + Optional findByNameIgnoreCase(String name); +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/categories/service/CategoryService.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/categories/service/CategoryService.java new file mode 100644 index 0000000..b77b5c7 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/categories/service/CategoryService.java @@ -0,0 +1,68 @@ +package com.example.qpickshop.categories.service; + +import java.util.List; +import java.util.stream.StreamSupport; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.qpickshop.core.error.NotFoundException; +import com.example.qpickshop.categories.model.CategoryEntity; +import com.example.qpickshop.categories.repository.CategoryRepository; + +@Service +public class CategoryService { + private final CategoryRepository repository; + + public CategoryService(CategoryRepository repository) { + this.repository = repository; + } + + private void checkName(String name) { + if (repository.findByNameIgnoreCase(name).isPresent()) { + throw new IllegalArgumentException(String.format("Category with name %s is already exists", name)); + } + } + + @Transactional(readOnly = true) + public List getAll() { + return StreamSupport.stream(repository.findAll().spliterator(), false).toList(); + } + + @Transactional(readOnly = true) + public Page getAll(int page, int size) { + return repository.findAll(PageRequest.of(page, size, Sort.by("id"))); + } + + @Transactional(readOnly = true) + public CategoryEntity get(Long id) { + return repository.findById(id) + .orElseThrow(() -> new NotFoundException(CategoryEntity.class, id)); + } + + @Transactional + public CategoryEntity create(CategoryEntity entity) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + checkName(entity.getName()); + return repository.save(entity); + } + + @Transactional + public CategoryEntity update(Long id, CategoryEntity entity) { + final CategoryEntity existsEntity = get(id); + existsEntity.setName(entity.getName()); + return repository.save(existsEntity); + } + + @Transactional + public CategoryEntity delete(Long id) { + final CategoryEntity existsEntity = get(id); + repository.delete(existsEntity); + return existsEntity; + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/api/GlobalController.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/api/GlobalController.java new file mode 100644 index 0000000..d68530a --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/api/GlobalController.java @@ -0,0 +1,30 @@ +package com.example.qpickshop.core.api; + +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ModelAttribute; + +import com.example.qpickshop.cartItems.service.CartItemService; +import com.example.qpickshop.core.security.UserPrincipal; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; + +@ControllerAdvice +public class GlobalController { + private CartItemService cartItemService; + + public GlobalController(CartItemService cartItemService) { + this.cartItemService = cartItemService; + } + + @ModelAttribute("servletPath") + String getRequestServletPath(HttpServletRequest request) { + return request.getServletPath(); + } + + @ModelAttribute("totalCart") + double getTotalCart(@AuthenticationPrincipal UserPrincipal principal) { + return cartItemService.getTotal(principal.getId()); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/api/PageAttributesMapper.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/api/PageAttributesMapper.java new file mode 100644 index 0000000..2c89cec --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/api/PageAttributesMapper.java @@ -0,0 +1,18 @@ +package com.example.qpickshop.core.api; + +import java.util.Map; +import java.util.function.Function; + +import org.springframework.data.domain.Page; + +public class PageAttributesMapper { + private PageAttributesMapper() { + } + + public static Map toAttributes(Page page, Function mapper) { + return Map.of( + "items", page.getContent().stream().map(mapper::apply).toList(), + "currentPage", page.getNumber(), + "totalPages", page.getTotalPages()); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/configuration/Constants.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/configuration/Constants.java new file mode 100644 index 0000000..e79a558 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/configuration/Constants.java @@ -0,0 +1,16 @@ +package com.example.qpickshop.core.configuration; + +public class Constants { + public static final String API_URL = "/api/1.0"; + public static final String SEQUENCE_NAME = "hibernate_sequence"; + public static final int DEFAULT_PAGE_SIZE = 5; + + public static final String REDIRECT_VIEW = "redirect:"; + public static final String ADMIN_PREFIX = "/admin"; + public static final String LOGIN_URL = "/login"; + public static final String LOGOUT_URL = "/logout"; + public static final String DEFAULT_PASSWORD = "123456"; + + private Constants() { + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/configuration/MapperConfiguration.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/configuration/MapperConfiguration.java new file mode 100644 index 0000000..3e93b52 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/configuration/MapperConfiguration.java @@ -0,0 +1,23 @@ +package com.example.qpickshop.core.configuration; + +import org.modelmapper.ModelMapper; +import org.modelmapper.PropertyMap; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import com.example.qpickshop.core.model.BaseEntity; + +@Configuration +public class MapperConfiguration { + @Bean + ModelMapper modelMapper() { + final ModelMapper mapper = new ModelMapper(); + mapper.addMappings(new PropertyMap() { + @Override + protected void configure() { + skip(destination.getId()); + } + }); + return mapper; + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/configuration/WebConfiguration.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/configuration/WebConfiguration.java new file mode 100644 index 0000000..28a9215 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/configuration/WebConfiguration.java @@ -0,0 +1,13 @@ +package com.example.qpickshop.core.configuration; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebConfiguration implements WebMvcConfigurer { + @Override + public void addViewControllers(ViewControllerRegistry registry) { + registry.addViewController("/login").setViewName("login"); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/error/AdviceController.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/error/AdviceController.java new file mode 100644 index 0000000..6bb3b39 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/error/AdviceController.java @@ -0,0 +1,53 @@ +package com.example.qpickshop.core.error; + +import java.util.Map; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.core.annotation.AnnotationUtils; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.servlet.ModelAndView; + +import jakarta.servlet.http.HttpServletRequest; + +@ControllerAdvice +public class AdviceController { + private final Logger log = LoggerFactory.getLogger(AdviceController.class); + + private static Throwable getRootCause(Throwable throwable) { + Throwable rootCause = throwable; + while (rootCause.getCause() != null && rootCause.getCause() != rootCause) { + rootCause = rootCause.getCause(); + } + return rootCause; + } + + private static Map getAttributes(HttpServletRequest request, Throwable throwable) { + final Throwable rootCause = getRootCause(throwable); + final StackTraceElement firstError = rootCause.getStackTrace()[0]; + return Map.of( + "message", rootCause.getMessage(), + "url", request.getRequestURL(), + "exception", rootCause.getClass().getName(), + "file", firstError.getFileName(), + "method", firstError.getMethodName(), + "line", firstError.getLineNumber()); + } + + @ExceptionHandler(value = Exception.class) + public ModelAndView defaultErrorHandler(HttpServletRequest request, Throwable throwable) throws Throwable { + if (AnnotationUtils.findAnnotation(throwable.getClass(), + ResponseStatus.class) != null) { + throw throwable; + } + + log.error("{}", throwable.getMessage()); + throwable.printStackTrace(); + final ModelAndView model = new ModelAndView(); + model.addAllObjects(getAttributes(request, throwable)); + model.setViewName("error"); + return model; + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/error/NotFoundException.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/error/NotFoundException.java new file mode 100644 index 0000000..d6a8c7e --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/error/NotFoundException.java @@ -0,0 +1,7 @@ +package com.example.qpickshop.core.error; + +public class NotFoundException extends RuntimeException { + public NotFoundException(Class javaClass, Long id) { + super(String.format("%s with id [%s] is not found or not exists", javaClass.getSimpleName(), id)); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/model/BaseEntity.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/model/BaseEntity.java new file mode 100644 index 0000000..7147706 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/model/BaseEntity.java @@ -0,0 +1,28 @@ +package com.example.qpickshop.core.model; + +import com.example.qpickshop.core.configuration.Constants; + +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.SequenceGenerator; + +@MappedSuperclass +public abstract class BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = Constants.SEQUENCE_NAME) + @SequenceGenerator(name = Constants.SEQUENCE_NAME, sequenceName = Constants.SEQUENCE_NAME, allocationSize = 1) + protected Long id; + + protected BaseEntity() { + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/security/SecurityConfiguration.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/security/SecurityConfiguration.java new file mode 100644 index 0000000..8a6f195 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/security/SecurityConfiguration.java @@ -0,0 +1,63 @@ +package com.example.qpickshop.core.security; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.dao.DaoAuthenticationProvider; +import org.springframework.security.config.Customizer; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer.FrameOptionsConfig; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; + +import com.example.qpickshop.core.configuration.Constants; +import com.example.qpickshop.users.api.UserSignupController; +import com.example.qpickshop.users.model.UserRole; + +@Configuration +@EnableWebSecurity +public class SecurityConfiguration { + @Bean + SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception { + httpSecurity.headers(headers -> headers.frameOptions(FrameOptionsConfig::sameOrigin)); + httpSecurity.csrf(AbstractHttpConfigurer::disable); + httpSecurity.cors(Customizer.withDefaults()); + + httpSecurity.authorizeHttpRequests(requests -> requests + .requestMatchers("/css/**", "/webjars/**", "/*.svg") + .permitAll()); + + httpSecurity.authorizeHttpRequests(requests -> requests + .requestMatchers(Constants.ADMIN_PREFIX + "/**").hasRole(UserRole.ADMIN.name()) + .requestMatchers("/h2-console/**").hasRole(UserRole.ADMIN.name()) + .requestMatchers(UserSignupController.URL).anonymous() + .requestMatchers(Constants.LOGIN_URL).anonymous() + .anyRequest().authenticated()); + + httpSecurity.formLogin(formLogin -> formLogin + .loginPage(Constants.LOGIN_URL)); + + httpSecurity.rememberMe(rememberMe -> rememberMe.key("uniqueAndSecret")); + + httpSecurity.logout(logout -> logout + .deleteCookies("JSESSIONID")); + + return httpSecurity.build(); + } + + @Bean + DaoAuthenticationProvider authenticationProvider(UserDetailsService userDetailsService) { + final DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider(); + authProvider.setUserDetailsService(userDetailsService); + authProvider.setPasswordEncoder(passwordEncoder()); + return authProvider; + } + + @Bean + PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/security/UserPrincipal.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/security/UserPrincipal.java new file mode 100644 index 0000000..50e6712 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/core/security/UserPrincipal.java @@ -0,0 +1,64 @@ +package com.example.qpickshop.core.security; + +import java.util.Collection; +import java.util.Set; + +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import com.example.qpickshop.users.model.UserEntity; + +public class UserPrincipal implements UserDetails { + private final long id; + private final String username; + private final String password; + private final Set roles; + private final boolean active; + + public UserPrincipal(UserEntity user) { + this.id = user.getId(); + this.username = user.getEmail(); + this.password = user.getPassword(); + this.roles = Set.of(user.getRole()); + this.active = true; + } + + public Long getId() { + return id; + } + + @Override + public String getUsername() { + return username; + } + + @Override + public String getPassword() { + return password; + } + + @Override + public Collection getAuthorities() { + return roles; + } + + @Override + public boolean isEnabled() { + return active; + } + + @Override + public boolean isAccountNonExpired() { + return isEnabled(); + } + + @Override + public boolean isAccountNonLocked() { + return isEnabled(); + } + + @Override + public boolean isCredentialsNonExpired() { + return isEnabled(); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/favouriteProducts/api/FavouriteProductController.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/favouriteProducts/api/FavouriteProductController.java new file mode 100644 index 0000000..c819c52 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/favouriteProducts/api/FavouriteProductController.java @@ -0,0 +1,55 @@ +package com.example.qpickshop.favouriteProducts.api; + +import java.util.Map; + +import org.modelmapper.ModelMapper; +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.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import com.example.qpickshop.core.api.PageAttributesMapper; +import com.example.qpickshop.core.configuration.Constants; +import com.example.qpickshop.core.security.UserPrincipal; +import com.example.qpickshop.favouriteProducts.service.FavouriteProductService; +import com.example.qpickshop.products.api.DefaultProductController; +import com.example.qpickshop.products.api.ExpandedProduct; +import com.example.qpickshop.products.model.ProductEntity; +import com.example.qpickshop.products.service.ProductService; + +@Controller +@RequestMapping(FavouriteProductController.URL) +public class FavouriteProductController extends DefaultProductController { + public static final String URL = "/favourites"; + public static final String FAVOURITES_VIEW = "favourites"; + protected static final String PAGE_ATTRIBUTE = "page"; + + public FavouriteProductController(ProductService productService, + ModelMapper modelMapper, FavouriteProductService favouriteProductService) { + super(productService, modelMapper, favouriteProductService, URL); + } + + private ExpandedProduct toExpandedDto(ProductEntity entity, Long userId) { + ExpandedProduct dto = modelMapper.map(entity, ExpandedProduct.class); + dto.setIsFavourite(true); + dto.setCategoryName(entity.getCategory().getName()); + return dto; + } + + @GetMapping + public String getAll( + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + Model model, + @AuthenticationPrincipal UserPrincipal principal) { + final Map attributes = PageAttributesMapper.toAttributes( + favouriteProductService.getAll(principal.getId(), page, + Constants.DEFAULT_PAGE_SIZE), + item -> toExpandedDto(item.getProduct(), principal.getId())); + model.addAllAttributes(attributes); + model.addAttribute(PAGE_ATTRIBUTE, page); + + return FAVOURITES_VIEW; + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/favouriteProducts/api/FavouriteProductDto.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/favouriteProducts/api/FavouriteProductDto.java new file mode 100644 index 0000000..aa9c603 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/favouriteProducts/api/FavouriteProductDto.java @@ -0,0 +1,31 @@ +package com.example.qpickshop.favouriteProducts.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; + +public class FavouriteProductDto { + private Long id; + + @NotNull + @Min(1) + private Long productId; + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getProductId() { + return productId; + } + + public void setProductId(Long productId) { + this.productId = productId; + } +} \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/favouriteProducts/model/FavouriteProductEntity.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/favouriteProducts/model/FavouriteProductEntity.java new file mode 100644 index 0000000..6dee764 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/favouriteProducts/model/FavouriteProductEntity.java @@ -0,0 +1,67 @@ +package com.example.qpickshop.favouriteProducts.model; + +import java.util.Objects; + +import com.example.qpickshop.core.model.BaseEntity; +import com.example.qpickshop.products.model.ProductEntity; +import com.example.qpickshop.users.model.UserEntity; + +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; + +@Entity +@Table(name = "favouriteProducts") +public class FavouriteProductEntity extends BaseEntity { + @ManyToOne + @JoinColumn(name = "userId", nullable = false) + private UserEntity user; + @ManyToOne + @JoinColumn(name = "productId", nullable = false) + private ProductEntity product; + + public FavouriteProductEntity() { + } + + public FavouriteProductEntity(UserEntity user, ProductEntity product) { + this.user = user; + this.product = product; + } + + public UserEntity getUser() { + return user; + } + + public void setUser(UserEntity user) { + this.user = user; + if (!user.getFavouriteProducts().contains(this)) { + user.getFavouriteProducts().add(this); + } + } + + public ProductEntity getProduct() { + return product; + } + + public void setProduct(ProductEntity product) { + this.product = product; + } + + @Override + public int hashCode() { + return Objects.hash(id, user, product); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final FavouriteProductEntity other = (FavouriteProductEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getUser(), user) + && Objects.equals(other.getProduct(), product); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/favouriteProducts/repository/FavouriteProductRepository.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/favouriteProducts/repository/FavouriteProductRepository.java new file mode 100644 index 0000000..2de866f --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/favouriteProducts/repository/FavouriteProductRepository.java @@ -0,0 +1,22 @@ +package com.example.qpickshop.favouriteProducts.repository; + +import java.util.List; +import java.util.Optional; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.PagingAndSortingRepository; + +import com.example.qpickshop.favouriteProducts.model.FavouriteProductEntity; + +public interface FavouriteProductRepository extends CrudRepository, PagingAndSortingRepository { + Page findByUserId(long userId, Pageable pageable); + + List findByUserId(long userId); + + Optional findByUserIdAndId(long userId, long id); + + FavouriteProductEntity findByProductIdAndUserId(long productId, long userId); + boolean existsByProductIdAndUserId(long productId, long userId); +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/favouriteProducts/service/FavouriteProductService.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/favouriteProducts/service/FavouriteProductService.java new file mode 100644 index 0000000..8280a69 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/favouriteProducts/service/FavouriteProductService.java @@ -0,0 +1,77 @@ +package com.example.qpickshop.favouriteProducts.service; + +import java.util.List; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.qpickshop.core.error.NotFoundException; +import com.example.qpickshop.favouriteProducts.model.FavouriteProductEntity; +import com.example.qpickshop.favouriteProducts.repository.FavouriteProductRepository; +import com.example.qpickshop.products.model.ProductEntity; +import com.example.qpickshop.products.service.ProductService; +import com.example.qpickshop.users.service.UserService; + +@Service +public class FavouriteProductService { + private final UserService userService; + private final ProductService productService; + private final FavouriteProductRepository repository; + + public FavouriteProductService(UserService userService, FavouriteProductRepository repository, + ProductService productService) { + this.userService = userService; + this.repository = repository; + this.productService = productService; + } + + @Transactional(readOnly = true) + public Page getAll(Long userId, int page, int size) { + return repository.findByUserId(userId, PageRequest.of(page, size, Sort.by("id"))); + } + + @Transactional(readOnly = true) + public List getAll(Long userId) { + userService.get(userId); + return repository.findByUserId(userId); + } + + @Transactional(readOnly = true) + public FavouriteProductEntity get(Long userId, Long productId) { + userService.get(userId); + return repository.findByProductIdAndUserId(productId, userId); + } + + @Transactional() + public FavouriteProductEntity create(FavouriteProductEntity entity, Long userId) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + + entity.setUser(userService.get(userId)); + return repository.save(entity); + } + + @Transactional + public FavouriteProductEntity delete(Long userId, Long productId) { + final FavouriteProductEntity existsEntity = get(userId, productId); + repository.delete(existsEntity); + return existsEntity; + } + + @Transactional + public FavouriteProductEntity toggle(Long userId, Long productId, boolean isFavourite) { + if (isFavourite) + return delete(userId, productId); + + return create(new FavouriteProductEntity(userService.get(userId), productService.get(productId)), userId); + } + + @Transactional(readOnly = true) + public boolean isExists(Long userId, Long productId) { + return repository.existsByProductIdAndUserId(productId, userId); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/index/api/IndexController.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/index/api/IndexController.java new file mode 100644 index 0000000..b93f5aa --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/index/api/IndexController.java @@ -0,0 +1,49 @@ +package com.example.qpickshop.index.api; + +import java.util.Map; + +import org.modelmapper.ModelMapper; +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.RequestParam; + +import com.example.qpickshop.core.api.PageAttributesMapper; +import com.example.qpickshop.core.configuration.Constants; +import com.example.qpickshop.core.security.UserPrincipal; +import com.example.qpickshop.favouriteProducts.service.FavouriteProductService; +import com.example.qpickshop.products.api.DefaultProductController; +import com.example.qpickshop.products.api.ExpandedProduct; +import com.example.qpickshop.products.model.ProductEntity; +import com.example.qpickshop.products.service.ProductService; + +@Controller +public class IndexController extends DefaultProductController { + public static final String PRODUCTS_VIEW = "index"; + + public IndexController(ProductService productService, + ModelMapper modelMapper, FavouriteProductService favouriteProductService) { + super(productService, modelMapper, favouriteProductService, "/"); + } + + protected ExpandedProduct toExpandedDto(ProductEntity entity, Long userId) { + ExpandedProduct dto = modelMapper.map(entity, ExpandedProduct.class); + dto.setIsFavourite(favouriteProductService.isExists(userId, dto.getId())); + dto.setCategoryName(entity.getCategory().getName()); + return dto; + } + + @GetMapping + public String getAll( + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + Model model, + @AuthenticationPrincipal UserPrincipal principal) { + final Map attributes = PageAttributesMapper.toAttributes( + productService.getAll(page, Constants.DEFAULT_PAGE_SIZE), item -> toExpandedDto(item, principal.getId())); + model.addAllAttributes(attributes); + model.addAttribute(PAGE_ATTRIBUTE, page); + + return PRODUCTS_VIEW; + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/api/ExpandedOrderItemDto.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/api/ExpandedOrderItemDto.java new file mode 100644 index 0000000..a19aa49 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/api/ExpandedOrderItemDto.java @@ -0,0 +1,22 @@ +package com.example.qpickshop.orders.api; + +public class ExpandedOrderItemDto extends OrderItemDto { + private String productName; + private Double productPrice; + + public String getProductName() { + return productName; + } + + public void setProductName(String name) { + this.productName = name; + } + + public Double getProductPrice() { + return productPrice; + } + + public void setProductPrice(Double price) { + this.productPrice = price; + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/api/OrderController.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/api/OrderController.java new file mode 100644 index 0000000..6abc2ea --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/api/OrderController.java @@ -0,0 +1,86 @@ +package com.example.qpickshop.orders.api; + +import org.modelmapper.ModelMapper; +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.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import com.example.qpickshop.core.api.PageAttributesMapper; +import com.example.qpickshop.core.configuration.Constants; +import com.example.qpickshop.core.security.UserPrincipal; +import com.example.qpickshop.orders.model.OrderEntity; +import com.example.qpickshop.orders.model.OrderItemEntity; +import com.example.qpickshop.orders.service.OrderItemService; +import com.example.qpickshop.orders.service.OrderService; +import com.example.qpickshop.products.model.ProductEntity; +import com.example.qpickshop.products.service.ProductService; + +@Controller +@RequestMapping(OrderController.URL) +public class OrderController { + public static final String URL = "/orders"; + private static final String ORDER_VIEW = "orders"; + private static final String ORDER_DETAILS_VIEW = "order-details"; + + private static final String ORDER_ATTRIBUTE = "order"; + private static final String PAGE_ATTRIBUTE = "page"; + + private final OrderService orderService; + private final OrderItemService orderItemService; + private final ModelMapper modelMapper; + private final ProductService productService; + + public OrderController( + OrderService orderService, + OrderItemService orderItemService, + ProductService productService, + ModelMapper modelMapper) { + this.orderService = orderService; + this.productService = productService; + this.orderItemService = orderItemService; + this.modelMapper = modelMapper; + } + + private OrderDto toDto(OrderEntity entity) { + return modelMapper.map(entity, OrderDto.class); + } + + private ExpandedOrderItemDto toOrderItemDto(OrderItemEntity entity) { + ExpandedOrderItemDto dto = modelMapper.map(entity, ExpandedOrderItemDto.class); + ProductEntity product = productService.get(dto.getProductId()); + dto.setProductName(product.getName()); + dto.setProductPrice(product.getPrice()); + return dto; + } + + @GetMapping + public String getProfile( + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + Model model, + @AuthenticationPrincipal UserPrincipal principal) { + final long userId = principal.getId(); + model.addAttribute(PAGE_ATTRIBUTE, page); + model.addAllAttributes(PageAttributesMapper.toAttributes( + orderService.getAll(userId, page, Constants.DEFAULT_PAGE_SIZE), + this::toDto)); + return ORDER_VIEW; + } + + @GetMapping("/details/{id}") + public String getOrderDetails( + @PathVariable(name = "id") Long id, + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + Model model, + @AuthenticationPrincipal UserPrincipal principal) { + final long userId = principal.getId(); + model.addAttribute(ORDER_ATTRIBUTE, orderService.get(userId, id)); + model.addAllAttributes(PageAttributesMapper.toAttributes( + orderItemService.getAll(id, page, Constants.DEFAULT_PAGE_SIZE), + this::toOrderItemDto)); + return ORDER_DETAILS_VIEW; + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/api/OrderDto.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/api/OrderDto.java new file mode 100644 index 0000000..f31e6e8 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/api/OrderDto.java @@ -0,0 +1,44 @@ +package com.example.qpickshop.orders.api; + +import java.util.Date; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + +public class OrderDto { + private Long id; + + private Date date; + + @NotNull + @Size(min = 1) + private List orderItems; + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public List getOrderItems() { + return orderItems; + } + + public void setOrderItems(List orderItems) { + this.orderItems = orderItems; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } +} \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/api/OrderItemDto.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/api/OrderItemDto.java new file mode 100644 index 0000000..ac659d6 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/api/OrderItemDto.java @@ -0,0 +1,43 @@ +package com.example.qpickshop.orders.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; + +public class OrderItemDto { + private Long id; + + @NotNull + @Min(1) + private Long productId; + + @NotNull + @Min(1) + private Integer quantity; + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getProductId() { + return productId; + } + + public void setProductId(Long productId) { + this.productId = productId; + } + + public Integer getQuantity() { + return quantity; + } + + public void setQuantity(Integer quantity) { + this.quantity = quantity; + } +} \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/model/ExpandedOrderEntity.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/model/ExpandedOrderEntity.java new file mode 100644 index 0000000..d7a1e66 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/model/ExpandedOrderEntity.java @@ -0,0 +1,20 @@ +package com.example.qpickshop.orders.model; + +public class ExpandedOrderEntity extends OrderEntity { + private Double total; + + public ExpandedOrderEntity(OrderEntity order, Double total) { + // Вызов конструктора суперкласса для установки общих полей заказа + super(order.getUser(), order.getDate()); + this.setId(order.getId()); // Устанавливаем идентификатор заказа + this.total = total; // Устанавливаем общую сумму + } + + public Double getTotal() { + return total; + } + + public void setTotal(Double total) { + this.total = total; + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/model/OrderEntity.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/model/OrderEntity.java new file mode 100644 index 0000000..753bfef --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/model/OrderEntity.java @@ -0,0 +1,95 @@ +package com.example.qpickshop.orders.model; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; + +import com.example.qpickshop.core.model.BaseEntity; +import com.example.qpickshop.users.model.UserEntity; + +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; + +@Entity +@Table(name = "orders") +public class OrderEntity extends BaseEntity { + @ManyToOne + @JoinColumn(name = "userId", nullable = false) + private UserEntity user; + + @Column(nullable = false) + private Date date = new Date(); + + @OneToMany(mappedBy = "order", cascade = CascadeType.ALL, fetch = FetchType.EAGER) + @OrderBy("id ASC") + private List items = new ArrayList<>(); + + public OrderEntity() { + } + + public OrderEntity(UserEntity user, Date date) { + this.user = user; + this.date = date; + } + + public UserEntity getUser() { + return user; + } + + public void setUser(UserEntity user) { + this.user = user; + if (!user.getOrders().contains(this)) { + user.getOrders().add(this); + } + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public List getItems() { + return items; + } + + public void setItems(List items) { + this.items = items; + } + + public void addItem(OrderItemEntity orderItem) { + if (orderItem.getOrder() != this) { + orderItem.setOrder(this); + } + + items.add(orderItem); + } + + @Override + public int hashCode() { + return Objects.hash(id, user, items, date); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final OrderEntity other = (OrderEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getItems(), items) + && Objects.equals(other.getDate(), date) + && Objects.equals(other.getUser(), user); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/model/OrderItemEntity.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/model/OrderItemEntity.java new file mode 100644 index 0000000..293399e --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/model/OrderItemEntity.java @@ -0,0 +1,78 @@ +package com.example.qpickshop.orders.model; + +import java.util.Objects; + +import com.example.qpickshop.core.model.BaseEntity; +import com.example.qpickshop.products.model.ProductEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; + +@Entity +@Table(name = "orderItems") +public class OrderItemEntity extends BaseEntity { + @ManyToOne + @JoinColumn(name = "productId", nullable = false) + private ProductEntity product; + @ManyToOne + @JoinColumn(name = "orderId", nullable = false) + private OrderEntity order; + @Column(nullable = false) + private Integer quantity; + + public OrderItemEntity() { + } + + public OrderItemEntity(ProductEntity product, Integer quantity) { + this.product = product; + this.quantity = quantity; + } + + public OrderEntity getOrder() { + return order; + } + + public void setOrder(OrderEntity order) { + this.order = order; + if (!order.getItems().contains(this)) { + order.getItems().add(this); + } + } + + public ProductEntity getProduct() { + return product; + } + + public void setProduct(ProductEntity product) { + this.product = product; + } + + public Integer getQuantity() { + return quantity; + } + + public void setQuantity(Integer quantity) { + this.quantity = quantity; + } + + @Override + public int hashCode() { + return Objects.hash(id, order, product, quantity); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final OrderItemEntity other = (OrderItemEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getOrder(), order) + && Objects.equals(other.getProduct(), product) + && Objects.equals(other.getQuantity(), quantity); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/repository/OrderItemRepository.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/repository/OrderItemRepository.java new file mode 100644 index 0000000..a777601 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/repository/OrderItemRepository.java @@ -0,0 +1,17 @@ +package com.example.qpickshop.orders.repository; + +import java.util.List; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.PagingAndSortingRepository; + +import com.example.qpickshop.orders.model.OrderItemEntity; + +public interface OrderItemRepository extends CrudRepository, + PagingAndSortingRepository { + List findByOrderId(long orderId); + + Page findByOrderId(long orderId, Pageable pageable); +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/repository/OrderRepository.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/repository/OrderRepository.java new file mode 100644 index 0000000..757675b --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/repository/OrderRepository.java @@ -0,0 +1,30 @@ +package com.example.qpickshop.orders.repository; + +import java.util.List; +import java.util.Optional; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.PagingAndSortingRepository; +import org.springframework.data.repository.query.Param; + +import com.example.qpickshop.orders.model.ExpandedOrderEntity; +import com.example.qpickshop.orders.model.OrderEntity; + +public interface OrderRepository extends CrudRepository, + PagingAndSortingRepository { + List findByUserId(long userId); + Page findByUserId(long userId, Pageable pageable); + + Optional findByUserIdAndId(long userId, long id); + + @Query("SELECT NEW com.example.qpickshop.orders.model.ExpandedOrderEntity(o, SUM(oi.quantity * p.price)) " + + "FROM OrderEntity o " + + "JOIN o.items oi " + + "JOIN oi.product p " + + "WHERE o.id = :orderId " + + "GROUP BY o") + ExpandedOrderEntity findOrderWithTotal(@Param("orderId") Long orderId); +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/service/OrderItemService.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/service/OrderItemService.java new file mode 100644 index 0000000..6be7315 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/service/OrderItemService.java @@ -0,0 +1,47 @@ +package com.example.qpickshop.orders.service; + +import java.util.List; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.qpickshop.core.error.NotFoundException; +import com.example.qpickshop.orders.model.OrderEntity; +import com.example.qpickshop.orders.model.OrderItemEntity; +import com.example.qpickshop.orders.repository.OrderItemRepository; + +@Service +public class OrderItemService { + private final OrderItemRepository repository; + + public OrderItemService(OrderItemRepository repository) { + this.repository = repository; + } + + @Transactional(readOnly = true) + public List getAll(Long orderId) { + return repository.findByOrderId(orderId); + } + + @Transactional(readOnly = true) + public Page getAll(long orderId, int page, int size) { + final Pageable pageable = PageRequest.of(page, size, Sort.by("id")); + return repository.findByOrderId(orderId, pageable); + } + + @Transactional(readOnly = true) + public OrderItemEntity get(Long id) { + return repository.findById(id) + .orElseThrow(() -> new NotFoundException(OrderItemEntity.class, id)); + } + + @Transactional + public List createMany(List orderItems) { + repository.saveAll(orderItems); + return orderItems; + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/service/OrderService.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/service/OrderService.java new file mode 100644 index 0000000..862b337 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/orders/service/OrderService.java @@ -0,0 +1,83 @@ +package com.example.qpickshop.orders.service; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.List; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.qpickshop.cartItems.api.CartItemDto; +import com.example.qpickshop.cartItems.model.CartItemEntity; +import com.example.qpickshop.cartItems.service.CartItemService; +import com.example.qpickshop.core.error.NotFoundException; +import com.example.qpickshop.orders.model.ExpandedOrderEntity; +import com.example.qpickshop.orders.model.OrderEntity; +import com.example.qpickshop.orders.model.OrderItemEntity; +import com.example.qpickshop.orders.repository.OrderRepository; +import com.example.qpickshop.products.service.ProductService; +import com.example.qpickshop.users.service.UserService; + +@Service +public class OrderService { + private final UserService userService; + private final OrderRepository repository; + private final OrderItemService orderItemService; + private final CartItemService cartItemService; + private final ProductService productService; + + public OrderService(CartItemService cartItemService, OrderRepository repository, OrderItemService orderItemService, + UserService userService, ProductService productService) { + this.repository = repository; + this.orderItemService = orderItemService; + this.userService = userService; + this.cartItemService = cartItemService; + this.productService = productService; + } + + @Transactional(readOnly = true) + public List getAll(Long userId) { + userService.get(userId); + return repository.findByUserId(userId); + } + + @Transactional(readOnly = true) + public Page getAll(long userId, int page, int size) { + final Pageable pageable = PageRequest.of(page, size, Sort.by("id")); + userService.get(userId); + return repository.findByUserId(userId, pageable); + } + + @Transactional(readOnly = true) + public ExpandedOrderEntity get(Long userId, Long id) { + userService.get(userId); + return repository.findOrderWithTotal(id); + } + + @Transactional + public OrderEntity create(Long userId) { + OrderEntity entity = new OrderEntity(userService.get(userId), new Date()); + + List cartItems = cartItemService.getAll(userId); + List orderItems = new ArrayList<>(); + + for (int i = 0; i < cartItems.size(); i++) { + OrderItemEntity oie = new OrderItemEntity(cartItems.get(i).getProduct(), cartItems.get(i).getQuantity()); + oie.setOrder(entity); + orderItems.add(oie); + } + + entity.setItems(orderItems); + + OrderEntity order = repository.save(entity); + orderItemService.createMany(order.getItems()); + cartItemService.clearCart(userId); + + return order; + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/products/api/DefaultProductController.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/products/api/DefaultProductController.java new file mode 100644 index 0000000..56f57bb --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/products/api/DefaultProductController.java @@ -0,0 +1,46 @@ +package com.example.qpickshop.products.api; + +import org.modelmapper.ModelMapper; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import com.example.qpickshop.core.configuration.Constants; +import com.example.qpickshop.core.security.UserPrincipal; +import com.example.qpickshop.favouriteProducts.service.FavouriteProductService; +import com.example.qpickshop.products.model.ProductEntity; +import com.example.qpickshop.products.service.ProductService; +import com.example.qpickshop.categories.service.CategoryService; + +public class DefaultProductController { + protected static final String PAGE_ATTRIBUTE = "page"; + protected String REDIRECT_AFTER_FAVOURITE_CLICK_PATH; + + protected final ProductService productService; + protected final FavouriteProductService favouriteProductService; + protected final ModelMapper modelMapper; + + public DefaultProductController(ProductService productService, + ModelMapper modelMapper, FavouriteProductService favouriteProductService, String REDIRECT_AFTER_FAVOURITE_CLICK_PATH) { + this.productService = productService; + this.favouriteProductService = favouriteProductService; + this.modelMapper = modelMapper; + this.REDIRECT_AFTER_FAVOURITE_CLICK_PATH = REDIRECT_AFTER_FAVOURITE_CLICK_PATH; + } + + @PostMapping("/favourite") + public String toggleFavourite( + Model model, + @RequestParam(name = "id") Long productId, + @RequestParam(name = "isFavourite") boolean isFavourite, + @AuthenticationPrincipal UserPrincipal principal) { + if (productId <= 0) { + throw new IllegalArgumentException(); + } + + favouriteProductService.toggle(principal.getId(), productId, isFavourite); + return Constants.REDIRECT_VIEW + REDIRECT_AFTER_FAVOURITE_CLICK_PATH; + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/products/api/ExpandedProduct.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/products/api/ExpandedProduct.java new file mode 100644 index 0000000..0e4ed0e --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/products/api/ExpandedProduct.java @@ -0,0 +1,24 @@ +package com.example.qpickshop.products.api; + +import jakarta.validation.constraints.NotBlank; + +public class ExpandedProduct extends ProductDto { + private String categoryName; + private boolean isFavourite; + + public String getCategoryName() { + return categoryName; + } + + public void setCategoryName(String categoryName) { + this.categoryName = categoryName; + } + + public boolean getIsFavourite() { + return isFavourite; + } + + public void setIsFavourite(boolean flag) { + this.isFavourite = flag; + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/products/api/ProductController.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/products/api/ProductController.java new file mode 100644 index 0000000..3a8c658 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/products/api/ProductController.java @@ -0,0 +1,145 @@ +package com.example.qpickshop.products.api; + +import java.util.Map; + +import org.modelmapper.ModelMapper; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +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.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import com.example.qpickshop.core.api.PageAttributesMapper; +import com.example.qpickshop.core.configuration.Constants; +import com.example.qpickshop.core.security.UserPrincipal; +import com.example.qpickshop.favouriteProducts.api.FavouriteProductController; +import com.example.qpickshop.favouriteProducts.service.FavouriteProductService; +import com.example.qpickshop.products.model.ProductEntity; +import com.example.qpickshop.products.service.ProductService; +import com.example.qpickshop.categories.api.CategoryDto; +import com.example.qpickshop.categories.model.CategoryEntity; +import com.example.qpickshop.categories.service.CategoryService; + +import jakarta.validation.Valid; + +@Controller +@RequestMapping(ProductController.URL) +public class ProductController { + public static final String URL = Constants.ADMIN_PREFIX + "/product"; + public static final String PRODUCT_VIEW = "product"; + public static final String PRODUCT_EDIT_VIEW = "product-edit"; + public static final String PRODUCT_ATTRIBUTE = "product"; + private static final String PAGE_ATTRIBUTE = "page"; + + private final ProductService productService; + private final CategoryService categoryService; + private final FavouriteProductService favouriteProductService; + private final ModelMapper modelMapper; + + public ProductController(ProductService productService, CategoryService typeService, + ModelMapper modelMapper, FavouriteProductService favouriteProductService) { + this.productService = productService; + this.categoryService = typeService; + this.favouriteProductService = favouriteProductService; + this.modelMapper = modelMapper; + } + + private ProductDto toDto(ProductEntity entity) { + return modelMapper.map(entity, ProductDto.class); + } + + private ExpandedProduct toExpandedDto(ProductEntity entity, Long userId) { + ExpandedProduct dto = modelMapper.map(entity, ExpandedProduct.class); + dto.setCategoryName(categoryService.get(dto.getCategoryId()).getName()); + dto.setIsFavourite(favouriteProductService.isExists(userId, dto.getId())); + return dto; + } + + private CategoryDto toCategoryDto(CategoryEntity entity) { + return modelMapper.map(entity, CategoryDto.class); + } + + private ProductEntity toEntity(ProductDto dto) { + final ProductEntity entity = modelMapper.map(dto, ProductEntity.class); + entity.setCategory(categoryService.get(dto.getCategoryId())); + return entity; + } + + @GetMapping + public String getAll( + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + Model model, + @AuthenticationPrincipal UserPrincipal principal) { + final Map attributes = PageAttributesMapper.toAttributes( + productService.getAll(page, Constants.DEFAULT_PAGE_SIZE), item -> toExpandedDto(item, principal.getId())); + model.addAllAttributes(attributes); + model.addAttribute(PAGE_ATTRIBUTE, page); + + return PRODUCT_VIEW; + } + + @GetMapping("/edit/") + public String create(Model model) { + model.addAttribute(PRODUCT_ATTRIBUTE, new ProductDto()); + model.addAttribute("categories", + categoryService.getAll().stream() + .map(this::toCategoryDto) + .toList()); + return PRODUCT_EDIT_VIEW; + } + + @PostMapping("/edit/") + public String create( + @ModelAttribute(name = PRODUCT_ATTRIBUTE) @Valid ProductDto product, + BindingResult bindingResult, + Model model) { + if (bindingResult.hasErrors()) { + return PRODUCT_EDIT_VIEW; + } + + productService.create(toEntity(product)); + return Constants.REDIRECT_VIEW + URL; + } + + @GetMapping("/edit/{id}") + public String update(@PathVariable(name = "id") Long id, Model model) { + if (id <= 0) { + throw new IllegalArgumentException(); + } + model.addAttribute("categories", + categoryService.getAll().stream() + .map(this::toCategoryDto) + .toList()); + model.addAttribute(PRODUCT_ATTRIBUTE, toDto(productService.get(id))); + return PRODUCT_EDIT_VIEW; + } + + @PostMapping("/edit/{id}") + public String update( + @PathVariable(name = "id") Long id, + @ModelAttribute(name = PRODUCT_ATTRIBUTE) @Valid ProductDto product, + BindingResult bindingResult, + Model model) { + if (bindingResult.hasErrors()) { + return PRODUCT_EDIT_VIEW; + } + if (id <= 0) { + throw new IllegalArgumentException(); + } + + productService.update(id, toEntity(product)); + return Constants.REDIRECT_VIEW + URL; + } + + @PostMapping("/delete/{id}") + public String delete( + @PathVariable(name = "id") Long id) { + productService.delete(id); + return Constants.REDIRECT_VIEW + URL; + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/products/api/ProductDto.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/products/api/ProductDto.java new file mode 100644 index 0000000..35f5aed --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/products/api/ProductDto.java @@ -0,0 +1,78 @@ +package com.example.qpickshop.products.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; + +public class ProductDto { + private Long id; + + @NotBlank + private String name; + + @NotNull + @Min(1) + private Long categoryId; + + @NotNull + @Min(1) + private Double price; + + @NotNull + @Min(0) + private Double rating; + + @NotBlank + private String description; + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Long getCategoryId() { + return categoryId; + } + + public void setCategoryId(Long categoryId) { + this.categoryId = categoryId; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + public Double getRating() { + return rating; + } + + public void setRating(Double rating) { + this.rating = rating; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/products/model/ProductEntity.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/products/model/ProductEntity.java new file mode 100644 index 0000000..0bff976 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/products/model/ProductEntity.java @@ -0,0 +1,101 @@ +package com.example.qpickshop.products.model; + +import java.util.Objects; + +import com.example.qpickshop.core.model.BaseEntity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; + +import com.example.qpickshop.categories.model.CategoryEntity; + +@Entity +@Table(name = "products") +public class ProductEntity extends BaseEntity { + @Column(nullable = false, unique = true) + private String name; + @Column(nullable = false) + private String description; + @Column(nullable = false) + private Double price; + @Column(nullable = false) + private Double rating; + @ManyToOne + @JoinColumn(name = "categoryId", nullable = false) + private CategoryEntity category; + + public ProductEntity() { + } + + public ProductEntity(String name, CategoryEntity category, + String description, Double price, Double rating) { + this.name = name; + this.category = category; + this.price = price; + this.rating = rating; + this.description = description; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public CategoryEntity getCategory() { + return category; + } + + public void setCategory(CategoryEntity category) { + this.category = category; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + public Double getRating() { + return rating; + } + + public void setRating(Double rating) { + this.rating = rating; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + @Override + public int hashCode() { + return Objects.hash(id, name, category, price, rating, description); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final ProductEntity other = (ProductEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getName(), name) + && Objects.equals(other.getCategory(), category) + && Objects.equals(other.getPrice(), price) + && Objects.equals(other.getRating(), rating) + && Objects.equals(other.getDescription(), description); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/products/repository/ProductRepository.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/products/repository/ProductRepository.java new file mode 100644 index 0000000..ffbf728 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/products/repository/ProductRepository.java @@ -0,0 +1,21 @@ +package com.example.qpickshop.products.repository; + +import java.util.List; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.PagingAndSortingRepository; + +import com.example.qpickshop.products.model.ProductEntity; + +public interface ProductRepository + extends CrudRepository, PagingAndSortingRepository { + List findByCategoryId(long categoryId); + + Page findByCategoryId(long categoryId, Pageable pageable); + + @Query("select p from ProductEntity p where p.price > ?1") + List findWherePriceMoreThen(int value); +} \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/products/service/ProductService.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/products/service/ProductService.java new file mode 100644 index 0000000..f64db70 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/products/service/ProductService.java @@ -0,0 +1,88 @@ +package com.example.qpickshop.products.service; + +import java.util.List; +import java.util.Objects; +import java.util.stream.StreamSupport; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.example.qpickshop.categories.model.CategoryEntity; +import com.example.qpickshop.core.error.NotFoundException; +import com.example.qpickshop.products.model.ProductEntity; +import com.example.qpickshop.products.repository.ProductRepository; + +@Service +public class ProductService { + private final ProductRepository repository; + + public ProductService(ProductRepository repository) { + this.repository = repository; + } + + @Transactional(readOnly = true) + public List getAll(Long categoryId) { + if (Objects.equals(categoryId, 0L)) { + return StreamSupport.stream(repository.findAll().spliterator(), false).toList(); + } + + return StreamSupport + .stream(repository.findByCategoryId(categoryId).spliterator(), false) + .toList(); + } + + @Transactional(readOnly = true) + public Page getAll(int page, int size) { + return repository.findAll(PageRequest.of(page, size, Sort.by("id"))); + } + + @Transactional(readOnly = true) + public Page getAll(Long categoryId, int page, int size) { + final PageRequest pageable = PageRequest.of(page, size); + if (Objects.equals(categoryId, 0L)) { + return repository.findAll(pageable); + } + + return repository.findByCategoryId(categoryId, pageable); + } + + @Transactional(readOnly = true) + public ProductEntity get(Long id) { + return repository.findById(id) + .orElseThrow(() -> new NotFoundException(ProductEntity.class, id)); + } + + @Transactional + public ProductEntity create(ProductEntity entity) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + return repository.save(entity); + } + + @Transactional + public ProductEntity update(Long id, ProductEntity entity) { + final ProductEntity existsEntity = get(id); + existsEntity.setName(entity.getName()); + existsEntity.setCategory(entity.getCategory()); + existsEntity.setPrice(entity.getPrice()); + existsEntity.setRating(entity.getRating()); + existsEntity.setDescription(entity.getDescription()); + return repository.save(existsEntity); + } + + @Transactional + public ProductEntity delete(Long id) { + final ProductEntity existsEntity = get(id); + repository.delete(existsEntity); + return existsEntity; + } + + @Transactional(readOnly = true) + public List getProductWherePriceMoreThen(int value) { + return repository.findWherePriceMoreThen(value); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/users/api/UserController.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/users/api/UserController.java new file mode 100644 index 0000000..39e3ba3 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/users/api/UserController.java @@ -0,0 +1,127 @@ +package com.example.qpickshop.users.api; + +import java.util.Map; + +import org.modelmapper.ModelMapper; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +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.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.servlet.mvc.support.RedirectAttributes; + +import com.example.qpickshop.core.api.PageAttributesMapper; +import com.example.qpickshop.core.configuration.Constants; +import com.example.qpickshop.users.model.UserEntity; +import com.example.qpickshop.users.service.UserService; + +import jakarta.validation.Valid; + +@Controller +@RequestMapping(UserController.URL) +public class UserController { + public static final String URL = Constants.ADMIN_PREFIX + "/user"; + private static final String USER_VIEW = "user"; + private static final String USER_EDIT_VIEW = "user-edit"; + private static final String PAGE_ATTRIBUTE = "page"; + private static final String USER_ATTRIBUTE = "user"; + + private final UserService userService; + private final ModelMapper modelMapper; + + public UserController(UserService userService, ModelMapper modelMapper) { + this.userService = userService; + this.modelMapper = modelMapper; + } + + private UserDto toDto(UserEntity entity) { + return modelMapper.map(entity, UserDto.class); + } + + private UserEntity toEntity(UserDto dto) { + return modelMapper.map(dto, UserEntity.class); + } + + @GetMapping + public String getAll( + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + Model model) { + final Map attributes = PageAttributesMapper.toAttributes( + userService.getAll(page, Constants.DEFAULT_PAGE_SIZE), this::toDto); + model.addAllAttributes(attributes); + model.addAttribute(PAGE_ATTRIBUTE, page); + return USER_VIEW; + } + + @GetMapping("/edit/") + public String create( + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + Model model) { + model.addAttribute(USER_ATTRIBUTE, new UserDto()); + model.addAttribute(PAGE_ATTRIBUTE, page); + return USER_EDIT_VIEW; + } + + @PostMapping("/edit/") + public String create( + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + @ModelAttribute(name = USER_ATTRIBUTE) @Valid UserDto user, + BindingResult bindingResult, + Model model, + RedirectAttributes redirectAttributes) { + if (bindingResult.hasErrors()) { + model.addAttribute(PAGE_ATTRIBUTE, page); + return USER_EDIT_VIEW; + } + redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page); + userService.create(toEntity(user)); + return Constants.REDIRECT_VIEW + URL; + } + + @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(USER_ATTRIBUTE, toDto(userService.get(id))); + model.addAttribute(PAGE_ATTRIBUTE, page); + return USER_EDIT_VIEW; + } + + @PostMapping("/edit/{id}") + public String update( + @PathVariable(name = "id") Long id, + @RequestParam(name = PAGE_ATTRIBUTE, defaultValue = "0") int page, + @ModelAttribute(name = USER_ATTRIBUTE) @Valid UserDto user, + BindingResult bindingResult, + Model model, + RedirectAttributes redirectAttributes) { + if (bindingResult.hasErrors()) { + model.addAttribute(PAGE_ATTRIBUTE, page); + return USER_EDIT_VIEW; + } + if (id <= 0) { + throw new IllegalArgumentException(); + } + redirectAttributes.addAttribute(PAGE_ATTRIBUTE, page); + userService.update(id, toEntity(user)); + 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); + userService.delete(id); + return Constants.REDIRECT_VIEW + URL; + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/users/api/UserDto.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/users/api/UserDto.java new file mode 100644 index 0000000..7977d12 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/users/api/UserDto.java @@ -0,0 +1,40 @@ +package com.example.qpickshop.users.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.NotBlank; + +public class UserDto { + private Long id; + + @NotBlank + private String email; + + @NotBlank + private String password; + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } +} \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/users/api/UserSignupController.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/users/api/UserSignupController.java new file mode 100644 index 0000000..df684da --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/users/api/UserSignupController.java @@ -0,0 +1,65 @@ +package com.example.qpickshop.users.api; + +import java.util.Objects; + +import org.modelmapper.ModelMapper; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +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.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import com.example.qpickshop.core.configuration.Constants; +import com.example.qpickshop.users.model.UserEntity; +import com.example.qpickshop.users.service.UserService; + +import jakarta.validation.Valid; + +@Controller +@RequestMapping(UserSignupController.URL) +public class UserSignupController { + public static final String URL = "/signup"; + + private static final String SIGNUP_VIEW = "signup"; + private static final String USER_ATTRIBUTE = "user"; + + private final UserService userService; + private final ModelMapper modelMapper; + + public UserSignupController( + UserService userService, + ModelMapper modelMapper) { + this.userService = userService; + this.modelMapper = modelMapper; + } + + private UserEntity toEntity(UserSignupDto dto) { + return modelMapper.map(dto, UserEntity.class); + } + + @GetMapping + public String getSignup(Model model) { + model.addAttribute(USER_ATTRIBUTE, new UserSignupDto()); + return SIGNUP_VIEW; + } + + @PostMapping + public String signup( + @ModelAttribute(name = USER_ATTRIBUTE) @Valid UserSignupDto user, + BindingResult bindingResult, + Model model) { + if (bindingResult.hasErrors()) { + return SIGNUP_VIEW; + } + if (!Objects.equals(user.getPassword(), user.getPasswordConfirm())) { + bindingResult.rejectValue("password", "signup:passwords", "Пароли не совпадают."); + model.addAttribute(USER_ATTRIBUTE, user); + return SIGNUP_VIEW; + } + userService.create(toEntity(user)); + return Constants.REDIRECT_VIEW + Constants.LOGIN_URL + "?signup"; + } + +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/users/api/UserSignupDto.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/users/api/UserSignupDto.java new file mode 100644 index 0000000..2374005 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/users/api/UserSignupDto.java @@ -0,0 +1,39 @@ +package com.example.qpickshop.users.api; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; + +public class UserSignupDto { + @NotBlank + private String email; + @NotBlank + @Size(min = 3, max = 20) + private String password; + @NotBlank + @Size(min = 3, max = 20) + private String passwordConfirm; + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getPasswordConfirm() { + return passwordConfirm; + } + + public void setPasswordConfirm(String passwordConfirm) { + this.passwordConfirm = passwordConfirm; + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/users/model/UserEntity.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/users/model/UserEntity.java new file mode 100644 index 0000000..aa4d55e --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/users/model/UserEntity.java @@ -0,0 +1,126 @@ +package com.example.qpickshop.users.model; + +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; + +import com.example.qpickshop.cartItems.model.CartItemEntity; +import com.example.qpickshop.core.model.BaseEntity; +import com.example.qpickshop.favouriteProducts.model.FavouriteProductEntity; +import com.example.qpickshop.orders.model.OrderEntity; + +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; + +@Entity +@Table(name = "users") +public class UserEntity extends BaseEntity { + @Column(nullable = false, unique = true, length = 50) + private String email; + @Column(nullable = false) + private String password; + private UserRole role; + + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) + @OrderBy("id ASC") + private Set orders = new HashSet<>(); + + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) + @OrderBy("id ASC") + private Set cartItems = new HashSet<>(); + + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) + @OrderBy("id ASC") + private Set favouriteProducts = new HashSet<>(); + + public UserEntity() { + } + + public UserEntity(String email, String password) { + this.email = email; + this.password = password; + this.role = UserRole.USER; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public UserRole getRole() { + return role; + } + + public void setRole(UserRole role) { + this.role = role; + } + + public Set getOrders() { + return orders; + } + + public void addOrder(OrderEntity order) { + if (order.getUser() != this) { + order.setUser(this); + } + + orders.add(order); + } + + public Set getCartItems() { + return cartItems; + } + + public void addCartItem(CartItemEntity cartItem) { + if (cartItem.getUser() != this) { + cartItem.setUser(this); + } + + cartItems.add(cartItem); + } + + public Set getFavouriteProducts() { + return favouriteProducts; + } + + public void addFavouriteProduct(FavouriteProductEntity favouriteProduct) { + if (favouriteProduct.getUser() != this) { + favouriteProduct.setUser(this); + } + + favouriteProducts.add(favouriteProduct); + } + + @Override + public int hashCode() { + return Objects.hash(id, email, password); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final UserEntity other = (UserEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getEmail(), email) + && Objects.equals(other.getRole(), role) + && Objects.equals(other.getPassword(), password); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/users/model/UserRole.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/users/model/UserRole.java new file mode 100644 index 0000000..2706980 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/users/model/UserRole.java @@ -0,0 +1,15 @@ +package com.example.qpickshop.users.model; + +import org.springframework.security.core.GrantedAuthority; + +public enum UserRole implements GrantedAuthority { + USER, + ADMIN; + + private static final String PREFIX = "ROLE_"; + + @Override + public String getAuthority() { + return PREFIX + this.name(); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/users/repository/UserRepository.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/users/repository/UserRepository.java new file mode 100644 index 0000000..76f3b09 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/users/repository/UserRepository.java @@ -0,0 +1,13 @@ +package com.example.qpickshop.users.repository; + +import java.util.Optional; + +import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.PagingAndSortingRepository; + +import com.example.qpickshop.users.model.UserEntity; + +public interface UserRepository + extends CrudRepository, PagingAndSortingRepository { + Optional findByEmailIgnoreCase(String email); +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/users/service/UserService.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/users/service/UserService.java new file mode 100644 index 0000000..21006bc --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/java/com/example/qpickshop/users/service/UserService.java @@ -0,0 +1,109 @@ +package com.example.qpickshop.users.service; + +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.StringUtils; + +import com.example.qpickshop.core.configuration.Constants; +import com.example.qpickshop.core.error.NotFoundException; +import com.example.qpickshop.core.security.UserPrincipal; +import com.example.qpickshop.users.model.UserEntity; +import com.example.qpickshop.users.model.UserRole; +import com.example.qpickshop.users.repository.UserRepository; + +@Service +public class UserService implements UserDetailsService { + private final UserRepository repository; + private final PasswordEncoder passwordEncoder; + + public UserService( + UserRepository repository, + PasswordEncoder passwordEncoder) { + this.repository = repository; + this.passwordEncoder = passwordEncoder; + } + + private void checkEmail(Long id, String email) { + final Optional existsUser = repository.findByEmailIgnoreCase(email); + if (existsUser.isPresent() && !existsUser.get().getId().equals(id)) { + throw new IllegalArgumentException( + String.format("User with email %s is already exists", email)); + } + } + + @Transactional(readOnly = true) + public List getAll() { + return StreamSupport.stream(repository.findAll().spliterator(), false).toList(); + } + + @Transactional(readOnly = true) + public Page getAll(int page, int size) { + return repository.findAll(PageRequest.of(page, size, Sort.by("id"))); + } + + @Transactional(readOnly = true) + public UserEntity get(long id) { + return repository.findById(id) + .orElseThrow(() -> new NotFoundException(UserEntity.class, id)); + } + + @Transactional + public UserEntity create(UserEntity entity) { + if (entity == null) { + throw new IllegalArgumentException("Entity is null"); + } + checkEmail(null, entity.getEmail()); + final String password = Optional.ofNullable(entity.getPassword()).orElse(""); + entity.setPassword( + passwordEncoder.encode( + StringUtils.hasText(password.strip()) ? password : Constants.DEFAULT_PASSWORD)); + entity.setRole(Optional.ofNullable(entity.getRole()).orElse(UserRole.USER)); + repository.save(entity); + return repository.save(entity); + } + + @Transactional + public UserEntity update(long id, UserEntity entity) { + final UserEntity existsEntity = get(id); + checkEmail(id, entity.getEmail()); + existsEntity.setEmail(entity.getEmail()); + repository.save(existsEntity); + return existsEntity; + } + + @Transactional + public UserEntity delete(long id) { + final UserEntity existsEntity = get(id); + repository.delete(existsEntity); + return existsEntity; + } + + @Override + @Transactional(readOnly = true) + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + final UserEntity existsUser = getByEmail(username); + return new UserPrincipal(existsUser); + } + + @Transactional(readOnly = true) + public UserEntity getByEmail(String email) { + return repository.findByEmailIgnoreCase(email) + .orElseThrow(() -> new IllegalArgumentException("Invalid email")); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/application.properties b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/application.properties new file mode 100644 index 0000000..e7fd2fa --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/application.properties @@ -0,0 +1,19 @@ +# Server +spring.main.banner-mode=off +server.port=8080 + +#Logger settings +logging.level.com.example.qpickshop=DEBUG + +#JPA Settings +spring.datasource.url=jdbc:h2:file:./data +spring.datasource.username=root +spring.datasource.password=root +spring.datasource.driver-class-name=org.h2.Driver +spring.jpa.hibernate.ddl-auto=create +spring.jpa.open-in-view=false +# spring.jpa.show-sql=true +# spring.jpa.properties.hibernate.format_sql=true + +# H2 console +spring.h2.console.enabled=true \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/public/css/style.css b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/public/css/style.css new file mode 100644 index 0000000..7423490 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/public/css/style.css @@ -0,0 +1,67 @@ +html, +body { + height: 100%; +} + +h1 { + font-size: 1.5em; +} + +h2 { + font-size: 1.25em; +} + +h3 { + font-size: 1.1em; +} + +td form { + margin: 0; + padding: 0; + margin-top: -.25em; +} + +.button-fixed-width { + width: 150px; +} + +.button-link { + padding: 0; +} + +.invalid-feedback { + display: block; +} + +.w-10 { + width: 10% !important; +} + +.my-navbar { + background-color: #3c3c3c !important; +} + +.my-navbar .link a:hover { + text-decoration: underline; +} + +.my-navbar .logo { + width: 26px; + height: 26px; +} + +.my-footer { + background-color: #2c2c2c; + height: 32px; + color: rgba(255, 255, 255, 0.5); +} + +.cart-image { + width: 3.1rem; + padding: 0.25rem; + border-radius: 0.5rem; +} + +.cart-item { + height: auto; +} \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/public/favicon.svg b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/public/favicon.svg new file mode 100644 index 0000000..7e1bd9a --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/public/favicon.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/cart.html b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/cart.html new file mode 100644 index 0000000..bde4744 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/cart.html @@ -0,0 +1,83 @@ + + + + + Корзина + + + +
+
+
+ Корзина +
+ +
+
+
+
+
+ [[${cartItem.productName}]] ([[${#numbers.formatDecimal(cartItem.productPrice, 1, 2)}]]) * + [[${cartItem.quantity}]] + = + [[${#numbers.formatDecimal(cartItem.productPrice * cartItem.quantity, 1, 2)}]] +
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+
+ +
+
+
+
+
+ +
+ + +
+
+
+ + +
+
+ +
+
+
+ + + + + \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/category-edit.html b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/category-edit.html new file mode 100644 index 0000000..bb116da --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/category-edit.html @@ -0,0 +1,29 @@ + + + + + Редакторовать категорию + + + +
+
+
+ + +
+
+ + +
+
+
+ + Отмена +
+
+
+ + + \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/category.html b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/category.html new file mode 100644 index 0000000..387dfa6 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/category.html @@ -0,0 +1,55 @@ + + + + + Категории + + + +
+ +

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

+ +

Категории

+ + + + + + + + + + + + + + + + + + + +
IDНазвание
+
+ +
+ 		+
+ +
+
+ + + + +
+ + + \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/default.html b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/default.html new file mode 100644 index 0000000..9055592 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/default.html @@ -0,0 +1,77 @@ + + + + + + + + My shop + + + + + + + + +
+
+
+ Автор, [[${#dates.year(#dates.createNow())}]] +
+ + + \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/error.html b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/error.html new file mode 100644 index 0000000..faa6b0a --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/error.html @@ -0,0 +1,37 @@ + + + + + Ошибка + + + +
+
    + +
  • + Неизвестная ошибка +
    • +     + +
  • + Ошибка: [[${message}]] +
    • +     + +
  • + Адрес: [[${url}]] +
    • +
  • + Класс исключения: [[${exception}]] +
    • +
  • + [[${method}]] ([[${file}]]:[[${line}]]) +
    • +     +
+ На главную +
+ + + \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/favourites.html b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/favourites.html new file mode 100644 index 0000000..64e5ffc --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/favourites.html @@ -0,0 +1,14 @@ + + + + + Избранные товары + + + +
+ +
+ + + \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/index.html b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/index.html new file mode 100644 index 0000000..e22fe66 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/index.html @@ -0,0 +1,14 @@ + + + + + Продукты + + + +
+ +
+ + + \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/login.html b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/login.html new file mode 100644 index 0000000..eb3a6d7 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/login.html @@ -0,0 +1,44 @@ + + + + + Вход + + + +
+
+
+ Неверный логин или пароль +
+
+ Выход успешно произведен +
+
+ Пользователь успешно создан +
+
+ + +
+
+ + +
+
+ + +
+
+ + Регистрация +
+
+
+ + + + + \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/order-details.html b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/order-details.html new file mode 100644 index 0000000..7b78a76 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/order-details.html @@ -0,0 +1,38 @@ + + + + +
+ +

Заказ №[[${order.id}]], [[${#dates.format(order.date, 'HH:mm dd-MM-yyyy')}]]

+ +

Товары заказа отсутствуют

+ + + + + + + + + + + + + + + + + +
Название товараЦенаКоличество
+ + +

Итого: [[${#numbers.formatDecimal(order.total, 1, 2)}]] руб

+ +
+ + + \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/orders.html b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/orders.html new file mode 100644 index 0000000..acc6894 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/orders.html @@ -0,0 +1,46 @@ + + + + + Заказы + + + +
+ +

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

+ + + + + + + + + + + + + + + + + +
IDДата
+
+ +
+
+ + +
+ Создать заказ +
+ +
+ + + \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/pagination.html b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/pagination.html new file mode 100644 index 0000000..b11664a --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/pagination.html @@ -0,0 +1,51 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/product-edit.html b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/product-edit.html new file mode 100644 index 0000000..638225c --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/product-edit.html @@ -0,0 +1,51 @@ + + + + + Редакторовать продукт + + + +
+
+
+ + +
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+ + Отмена +
+
+
+ + + \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/product.html b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/product.html new file mode 100644 index 0000000..529e028 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/product.html @@ -0,0 +1,63 @@ + + + + + Продукты + + + +
+ +

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

+ +

Продукты

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
IDНазваниеID категорииОписаниеЦенаРейтинг
+
+ +
+ 		+
+ +
+
+ + + + +
+ + + \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/products.html b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/products.html new file mode 100644 index 0000000..ad2c559 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/products.html @@ -0,0 +1,44 @@ + + + + + Продукты + + + + + +

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

+ +

[[${title}]]

+ +
+
+
+
+

+

+
+

[[${product.price}]] руб.

+

+
+
+ +
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/signup.html b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/signup.html new file mode 100644 index 0000000..5921ed3 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/signup.html @@ -0,0 +1,37 @@ + + + + + Вход + + + +
+
+
+ + +
+
+
+ + +
+
+
+ + +
+
+
+ + Отмена +
+
+
+ + + + + \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/user-edit.html b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/user-edit.html new file mode 100644 index 0000000..e0546fb --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/user-edit.html @@ -0,0 +1,34 @@ + + + + + Редакторовать пользователя + + + +
+
+
+ + +
+
+ + +
+
+ +
+ + Отмена +
+
+
+ + + \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/user.html b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/user.html new file mode 100644 index 0000000..07092c0 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/main/resources/templates/user.html @@ -0,0 +1,53 @@ + + + + + Пользователи + + + +
+ +

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

+ +

Пользователи

+ + + + + + + + + + + + + + + + + + +
IDПочта
+
+ + +
+ 		+
+ + +
+
+ + + +
+ + + \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/test/java/com/example/qpickshop/CartItemServiceTests.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/test/java/com/example/qpickshop/CartItemServiceTests.java new file mode 100644 index 0000000..589bc06 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/test/java/com/example/qpickshop/CartItemServiceTests.java @@ -0,0 +1,82 @@ +package com.example.qpickshop; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import com.example.qpickshop.core.error.NotFoundException; +import com.example.qpickshop.products.model.ProductEntity; +import com.example.qpickshop.products.service.ProductService; +import com.example.qpickshop.cartItems.model.CartItemEntity; +import com.example.qpickshop.cartItems.service.CartItemService; +import com.example.qpickshop.categories.model.CategoryEntity; +import com.example.qpickshop.categories.service.CategoryService; +import com.example.qpickshop.users.model.UserEntity; +import com.example.qpickshop.users.service.UserService; + +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +public class CartItemServiceTests { + @Autowired + private CartItemService cartItemService; + @Autowired + private UserService userService; + @Autowired + private CategoryService categoryService; + @Autowired + private ProductService productService; + + private UserEntity user; + private UserEntity user2; + private ProductEntity product; + private CartItemEntity cartItem; + + @BeforeEach + void createData() { + removeData(); + + user = userService.create(new UserEntity("email", "password")); + user2 = userService.create(new UserEntity("email3", "password")); + + CategoryEntity category = categoryService.create(new CategoryEntity("category")); + product = productService.create(new ProductEntity("name", category, "descr", 22.1, 1.1)); + ProductEntity product2 = productService.create(new ProductEntity("name2", category, "descr2", 22.21, 3.1)); + + cartItem = cartItemService.create(new CartItemEntity(user, product, 3), user.getId()); + cartItemService.create(new CartItemEntity(user, product2, 8), user.getId()); + } + + @AfterEach + void removeData() { + if (user != null) + cartItemService.getAll(user.getId()).forEach(ci -> cartItemService.delete(user.getId(), + ci.getId())); + userService.getAll().forEach(item -> userService.delete(item.getId())); + productService.getAll(0L).forEach(p -> productService.delete(p.getId())); + categoryService.getAll().forEach(c -> categoryService.delete(c.getId())); + } + + @Test + void getTest() { + Assertions.assertThrows(NotFoundException.class, () -> cartItemService.get(user.getId(), 0L)); + } + + @Test + @Order(1) + void createTest() { + Assertions.assertEquals(cartItemService.getAll(user.getId()).size(), 2); + Assertions.assertEquals(cartItemService.getAll(user2.getId()).size(), 0); + } + + @Test + void deleteTest() { + cartItemService.delete(user.getId(), cartItem.getId()); + Assertions.assertEquals(cartItemService.getAll(user.getId()).size(), 1); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/test/java/com/example/qpickshop/CategoryServiceTests.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/test/java/com/example/qpickshop/CategoryServiceTests.java new file mode 100644 index 0000000..7a1bdb8 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/test/java/com/example/qpickshop/CategoryServiceTests.java @@ -0,0 +1,82 @@ +package com.example.qpickshop; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.dao.DataIntegrityViolationException; + +import com.example.qpickshop.core.error.NotFoundException; +import com.example.qpickshop.categories.model.CategoryEntity; +import com.example.qpickshop.categories.service.CategoryService; + +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +class CategoryServiceTests { + @Autowired + private CategoryService categoryService; + + private CategoryEntity category; + + @BeforeEach + void createData() { + removeData(); + + category = categoryService.create(new CategoryEntity("Ноутбук")); + categoryService.create(new CategoryEntity("Телефон")); + categoryService.create(new CategoryEntity("Телевизор")); + } + + @AfterEach + void removeData() { + categoryService.getAll().forEach(item -> categoryService.delete(item.getId())); + } + + @Test + void getTest() { + Assertions.assertThrows(NotFoundException.class, () -> categoryService.get(0L)); + } + + @Test + void createTest() { + Assertions.assertEquals(3, categoryService.getAll().size()); + Assertions.assertEquals(category, categoryService.get(category.getId())); + } + + @Test + void createNotUniqueTest() { + final CategoryEntity nonUniqueCategory = new CategoryEntity("Ноутбук"); + Assertions.assertThrows(IllegalArgumentException.class, () -> categoryService.create(nonUniqueCategory)); + } + + @Test + void createNullableTest() { + final CategoryEntity nullableCategory = new CategoryEntity(null); + Assertions.assertThrows(DataIntegrityViolationException.class, () -> categoryService.create(nullableCategory)); + } + + @Test + void updateTest() { + final String test = "TEST"; + final String oldName = category.getName(); + final CategoryEntity newEntity = categoryService.update(category.getId(), new CategoryEntity(test)); + Assertions.assertEquals(3, categoryService.getAll().size()); + Assertions.assertEquals(newEntity, categoryService.get(category.getId())); + Assertions.assertEquals(test, newEntity.getName()); + Assertions.assertNotEquals(oldName, newEntity.getName()); + } + + @Test + void deleteTest() { + categoryService.delete(category.getId()); + Assertions.assertEquals(2, categoryService.getAll().size()); + + final CategoryEntity newEntity = categoryService.create(new CategoryEntity(category.getName())); + Assertions.assertEquals(3, categoryService.getAll().size()); + Assertions.assertNotEquals(category.getId(), newEntity.getId()); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/test/java/com/example/qpickshop/FavouriteServiceTests.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/test/java/com/example/qpickshop/FavouriteServiceTests.java new file mode 100644 index 0000000..54b85eb --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/test/java/com/example/qpickshop/FavouriteServiceTests.java @@ -0,0 +1,80 @@ +package com.example.qpickshop; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import com.example.qpickshop.core.error.NotFoundException; +import com.example.qpickshop.products.model.ProductEntity; +import com.example.qpickshop.products.service.ProductService; +import com.example.qpickshop.favouriteProducts.model.FavouriteProductEntity; +import com.example.qpickshop.favouriteProducts.service.FavouriteProductService; +import com.example.qpickshop.categories.model.CategoryEntity; +import com.example.qpickshop.categories.service.CategoryService; +import com.example.qpickshop.users.model.UserEntity; +import com.example.qpickshop.users.service.UserService; + +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +public class FavouriteServiceTests { + @Autowired + private FavouriteProductService favouriteProductService; + @Autowired + private UserService userService; + @Autowired + private CategoryService categoryService; + @Autowired + private ProductService productService; + + private UserEntity user; + private UserEntity user2; + private FavouriteProductEntity favouriteProduct; + + @BeforeEach + void createData() { + removeData(); + + user = userService.create(new UserEntity("email", "password")); + user2 = userService.create(new UserEntity("email3", "password")); + + CategoryEntity category = categoryService.create(new CategoryEntity("category")); + ProductEntity product = productService.create(new ProductEntity("name", category, "descr", 22.1, 1.1)); + ProductEntity product2 = productService.create(new ProductEntity("name2", category, "descr2", 22.21, 3.1)); + + favouriteProduct = favouriteProductService.create(new FavouriteProductEntity(user, product), user.getId()); + favouriteProductService.create(new FavouriteProductEntity(user, product2), user.getId()); + } + + @AfterEach + void removeData() { + if (user != null) favouriteProductService.getAll(user.getId()).forEach(fp -> favouriteProductService.delete(user.getId(), + fp.getId())); + userService.getAll().forEach(item -> userService.delete(item.getId())); + productService.getAll(0L).forEach(p -> productService.delete(p.getId())); + categoryService.getAll().forEach(c -> categoryService.delete(c.getId())); + } + + @Test + void getTest() { + Assertions.assertThrows(NotFoundException.class, () -> favouriteProductService.get(user.getId(), 0L)); + } + + @Test + void createTest() { + Assertions.assertEquals(favouriteProductService.getAll(user.getId()).size(), 2); + Assertions.assertEquals(favouriteProductService.getAll(user2.getId()).size(), 0); + } + + @Test + @Order(2) + void deleteTest() { + favouriteProductService.delete(user.getId(), favouriteProduct.getId()); + Assertions.assertEquals(favouriteProductService.getAll(user.getId()).size(), 1); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/test/java/com/example/qpickshop/OrderItemServiceTests.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/test/java/com/example/qpickshop/OrderItemServiceTests.java new file mode 100644 index 0000000..6158292 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/test/java/com/example/qpickshop/OrderItemServiceTests.java @@ -0,0 +1,75 @@ +package com.example.qpickshop; + +import java.util.List; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import com.example.qpickshop.categories.model.CategoryEntity; +import com.example.qpickshop.categories.service.CategoryService; +import com.example.qpickshop.core.error.NotFoundException; +import com.example.qpickshop.orders.model.OrderEntity; +import com.example.qpickshop.orders.model.OrderItemEntity; +import com.example.qpickshop.orders.service.OrderItemService; +import com.example.qpickshop.orders.service.OrderService; +import com.example.qpickshop.products.model.ProductEntity; +import com.example.qpickshop.products.service.ProductService; +import com.example.qpickshop.users.service.UserService; + +import com.example.qpickshop.users.model.UserEntity; +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +public class OrderItemServiceTests { + @Autowired + private UserService userService; + @Autowired + private ProductService productService; + @Autowired + private CategoryService categoryService; + @Autowired + private OrderService orderService; + @Autowired + private OrderItemService orderItemService; + + private OrderEntity order; + private OrderEntity order2; + private OrderEntity order3; + + @Test + void getTest() { + Assertions.assertThrows(NotFoundException.class, () -> orderItemService.get(0L)); + } + + @Test + void createTest() { + CategoryEntity category = categoryService.create(new CategoryEntity("testcategory")); + ProductEntity product = productService.create(new ProductEntity("testproductin", category, "description3", 11.1, 1.1)); + ProductEntity product2 = productService.create(new ProductEntity("testproductin2", category, "description2", 11.1, 1.1)); + + UserEntity user = userService.create(new UserEntity("emailll", "password")); + + order = orderService.create(user.getId()); + order2 = orderService.create(user.getId()); + order3 = orderService.create(user.getId()); + + + OrderItemEntity oie = new OrderItemEntity(product, 3); + OrderItemEntity oie2 = new OrderItemEntity(product2, 5); + OrderItemEntity oie3 = new OrderItemEntity(product, 8); + oie.setOrder(order); + oie2.setOrder(order); + + oie3.setOrder(order2); + + orderItemService.createMany(List.of(oie, oie2)); + orderItemService.createMany(List.of(oie3)); + + Assertions.assertEquals(2, orderItemService.getAll(order.getId()).size()); + Assertions.assertEquals(1, orderItemService.getAll(order2.getId()).size()); + Assertions.assertEquals(0, orderItemService.getAll(order3.getId()).size()); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/test/java/com/example/qpickshop/OrderServiceTests.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/test/java/com/example/qpickshop/OrderServiceTests.java new file mode 100644 index 0000000..77f78ae --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/test/java/com/example/qpickshop/OrderServiceTests.java @@ -0,0 +1,56 @@ +package com.example.qpickshop; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import com.example.qpickshop.core.error.NotFoundException; +import com.example.qpickshop.orders.service.OrderService; +import com.example.qpickshop.users.model.UserEntity; +import com.example.qpickshop.users.service.UserService; + +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +public class OrderServiceTests { + @Autowired + private OrderService orderService; + @Autowired + private UserService userService; + + private UserEntity user; + private UserEntity user2; + + @BeforeEach void createData() { + removeData(); + + user = userService.create(new UserEntity("email", "password")); + user2 = userService.create(new UserEntity("email2", "password2")); + + for (int i = 0; i < 4; i++) { + orderService.create(user.getId()); + } + } + + @AfterEach + void removeData() { + userService.getAll().forEach(item -> userService.delete(item.getId())); + } + + @Test + void getTest() { + Assertions.assertThrows(NotFoundException.class, () -> orderService.get(user.getId(), 0L)); + } + + @Test + @Order(1) + void createTest() { + Assertions.assertEquals(4, orderService.getAll(user.getId()).size()); + Assertions.assertEquals(0, orderService.getAll(user2.getId()).size()); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/test/java/com/example/qpickshop/ProductServiceTests.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/test/java/com/example/qpickshop/ProductServiceTests.java new file mode 100644 index 0000000..8ccff78 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/test/java/com/example/qpickshop/ProductServiceTests.java @@ -0,0 +1,108 @@ +package com.example.qpickshop; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.dao.DataIntegrityViolationException; + +import com.example.qpickshop.core.error.NotFoundException; +import com.example.qpickshop.products.model.ProductEntity; +import com.example.qpickshop.products.service.ProductService; +import com.example.qpickshop.categories.model.CategoryEntity; +import com.example.qpickshop.categories.service.CategoryService; + +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +class ProductServiceTests { + @Autowired + private ProductService productService; + @Autowired + private CategoryService categoryService; + + private ProductEntity product; + private CategoryEntity category1; + + @BeforeEach + void createData() { + removeData(); + + category1 = categoryService.create(new CategoryEntity("Телефоны")); + + product = productService.create(new ProductEntity("name1", category1, "description1", 99.99, 0.4)); + productService.create(new ProductEntity("name2", category1, "description2", 22.22, 2.2)); + productService.create(new ProductEntity("name3", category1, "description3", 11.1, 1.1)); + } + + @AfterEach + void removeData() { + productService.getAll(0L).forEach(item -> productService.delete(item.getId())); + categoryService.getAll().forEach(item -> categoryService.delete(item.getId())); + } + + @Test + void getTest() { + Assertions.assertThrows(NotFoundException.class, () -> productService.get(0L)); + } + + @Test + void createTest() { + Assertions.assertEquals(3, productService.getAll(0L).size()); + Assertions.assertEquals(product, productService.get(product.getId())); + } + + @Test + void createNullableTest() { + final ProductEntity nullableProduct = new ProductEntity(null, null, null, null, null); + Assertions.assertThrows(DataIntegrityViolationException.class, () -> productService.create(nullableProduct)); + } + + @Test + void updateTest() { + final String testName = "TEST"; + final String testDescription = "TEST_DESCRIPTION"; + final CategoryEntity testCategory = categoryService.create(new CategoryEntity("Ноутбуки")); + final Double testPrice = 33.1; + final Double testRating = 3.0; + + final String oldName = product.getName(); + final String oldDescription = product.getDescription(); + final CategoryEntity oldCategory = product.getCategory(); + final Double oldPrice = product.getPrice(); + final Double oldRating = product.getRating(); + + final ProductEntity newEntity = productService.update(product.getId(), new ProductEntity(testName, testCategory, testDescription, testPrice, testRating)); + Assertions.assertEquals(3, productService.getAll(0L).size()); + Assertions.assertEquals(newEntity, productService.get(product.getId())); + + Assertions.assertEquals(testName, newEntity.getName()); + Assertions.assertNotEquals(oldName, newEntity.getName()); + + Assertions.assertEquals(testDescription, newEntity.getDescription()); + Assertions.assertNotEquals(oldDescription, newEntity.getDescription()); + + Assertions.assertEquals(testCategory, newEntity.getCategory()); + Assertions.assertNotEquals(oldCategory, newEntity.getCategory()); + + Assertions.assertEquals(testPrice, newEntity.getPrice()); + Assertions.assertNotEquals(oldPrice, newEntity.getPrice()); + + Assertions.assertEquals(testRating, newEntity.getRating()); + Assertions.assertNotEquals(oldRating, newEntity.getRating()); + } + + @Test + void deleteTest() { + productService.delete(product.getId()); + Assertions.assertEquals(2, productService.getAll(0L).size()); + + final ProductEntity newEntity = productService.create(new ProductEntity(product.getName(), product.getCategory(), + product.getDescription(), product.getPrice(), product.getRating())); + Assertions.assertEquals(3, productService.getAll(0L).size()); + Assertions.assertNotEquals(product.getId(), newEntity.getId()); + } +} \ No newline at end of file diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/test/java/com/example/qpickshop/UserServiceTests.java b/semestr_2/Lab. 4 + 5/qpick-shop/src/test/java/com/example/qpickshop/UserServiceTests.java new file mode 100644 index 0000000..2bdf6d0 --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/test/java/com/example/qpickshop/UserServiceTests.java @@ -0,0 +1,87 @@ +package com.example.qpickshop; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.dao.DataIntegrityViolationException; + +import com.example.qpickshop.core.error.NotFoundException; +import com.example.qpickshop.users.model.UserEntity; +import com.example.qpickshop.users.service.UserService; + +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +class UserServiceTests { + @Autowired + private UserService userService; + + private UserEntity user; + + @BeforeEach + void createData() { + removeData(); + + user = userService.create(new UserEntity("email", "password")); + userService.create(new UserEntity("email2", "password2")); + userService.create(new UserEntity("email3", "password3")); + } + + @AfterEach + void removeData() { + userService.getAll().forEach(item -> userService.delete(item.getId())); + } + + @Test + void getTest() { + Assertions.assertThrows(NotFoundException.class, () -> userService.get(0L)); + } + + @Test + void createTest() { + Assertions.assertEquals(3, userService.getAll().size()); + Assertions.assertEquals(user, userService.get(user.getId())); + } + + @Test + void createNotUniqueTest() { + final UserEntity nonUniqueUser = new UserEntity("email", "password"); + Assertions.assertThrows(IllegalArgumentException.class, () -> userService.create(nonUniqueUser)); + } + + @Test + void createNullableTest() { + final UserEntity nullableUser = new UserEntity(null, null); + Assertions.assertThrows(DataIntegrityViolationException.class, () -> userService.create(nullableUser)); + } + + @Test + void updateTest() { + final String test = "TEST"; + final String testPassword = "TEST_PASSWORD"; + + final String oldEmail = user.getEmail(); + final String oldPassword = user.getPassword(); + + final UserEntity newEntity = userService.update(user.getId(), new UserEntity(test, testPassword)); + Assertions.assertEquals(3, userService.getAll().size()); + Assertions.assertEquals(newEntity, userService.get(user.getId())); + + Assertions.assertEquals(test, newEntity.getEmail()); + Assertions.assertNotEquals(oldEmail, newEntity.getEmail()); + } + + @Test + void deleteTest() { + userService.delete(user.getId()); + Assertions.assertEquals(2, userService.getAll().size()); + + final UserEntity newEntity = userService.create(new UserEntity(user.getEmail(), user.getPassword())); + Assertions.assertEquals(3, userService.getAll().size()); + Assertions.assertNotEquals(user.getId(), newEntity.getId()); + } +} diff --git a/semestr_2/Lab. 4 + 5/qpick-shop/src/test/resources/application.properties b/semestr_2/Lab. 4 + 5/qpick-shop/src/test/resources/application.properties new file mode 100644 index 0000000..515cf0a --- /dev/null +++ b/semestr_2/Lab. 4 + 5/qpick-shop/src/test/resources/application.properties @@ -0,0 +1,10 @@ +spring.main.banner-mode=off + +logging.level.com.example.qpickshop=DEBUG + +spring.datasource.url=jdbc:h2:mem:testdb +spring.datasource.username=root +spring.datasource.password=root +spring.datasource.driver-class-name=org.h2.Driver +spring.jpa.hibernate.ddl-auto=create +spring.jpa.open-in-view=false \ No newline at end of file