From 7e12068e8b94d0455d4fd93b1fd1e5073c29f683 Mon Sep 17 00:00:00 2001 From: "DozorovaA.A" Date: Mon, 12 Jun 2023 20:53:10 +0400 Subject: [PATCH] add mvc structure --- build.gradle | 8 ++ data.mv.db | Bin 45056 -> 65536 bytes .../com/example/demo/WebConfiguration.java | 23 +++-- .../controller/AppointmentController.java | 3 +- .../speaker/controller/CompanyController.java | 10 +-- .../controller/{ => DTO}/AppointmentDTO.java | 2 +- .../controller/{ => DTO}/CompanyDTO.java | 2 +- .../controller/{ => DTO}/EmployeeDTO.java | 6 +- .../{ => DTO}/RequestForCooperationDTO.java | 6 +- .../controller/EmployeeController.java | 2 +- .../AppointmentMVCController.java | 59 +++++++++++++ .../MVCController/CompanyMVCController.java | 48 ++++++++++ .../MVCController/EmployeeMVCController.java | 62 +++++++++++++ .../MVCController/RequestMVCController.java | 83 ++++++++++++++++++ .../RequestForCooperationController.java | 1 + .../speaker/service/AppointmentService.java | 3 +- .../demo/speaker/service/CompanyService.java | 5 +- .../demo/speaker/service/EmployeeService.java | 2 +- .../service/RequestForCooperationService.java | 3 +- src/main/resources/templates/appointment.html | 47 ++++++++++ src/main/resources/templates/company.html | 50 +++++++++++ src/main/resources/templates/default.html | 50 +++++++++++ src/main/resources/templates/employee.html | 54 ++++++++++++ src/main/resources/templates/index.html | 12 +++ src/main/resources/templates/request.html | 67 ++++++++++++++ src/test/java/com/example/demo/JPATests.java | 19 ---- 26 files changed, 564 insertions(+), 63 deletions(-) rename src/main/java/com/example/demo/speaker/controller/{ => DTO}/AppointmentDTO.java (89%) rename src/main/java/com/example/demo/speaker/controller/{ => DTO}/CompanyDTO.java (95%) rename src/main/java/com/example/demo/speaker/controller/{ => DTO}/EmployeeDTO.java (71%) rename src/main/java/com/example/demo/speaker/controller/{ => DTO}/RequestForCooperationDTO.java (86%) create mode 100644 src/main/java/com/example/demo/speaker/controller/MVCController/AppointmentMVCController.java create mode 100644 src/main/java/com/example/demo/speaker/controller/MVCController/CompanyMVCController.java create mode 100644 src/main/java/com/example/demo/speaker/controller/MVCController/EmployeeMVCController.java create mode 100644 src/main/java/com/example/demo/speaker/controller/MVCController/RequestMVCController.java create mode 100644 src/main/resources/templates/appointment.html create mode 100644 src/main/resources/templates/company.html create mode 100644 src/main/resources/templates/default.html create mode 100644 src/main/resources/templates/employee.html create mode 100644 src/main/resources/templates/index.html create mode 100644 src/main/resources/templates/request.html diff --git a/build.gradle b/build.gradle index cb56679..b6b034e 100644 --- a/build.gradle +++ b/build.gradle @@ -18,6 +18,14 @@ dependencies { implementation 'com.h2database:h2:2.1.210' testImplementation 'org.springframework.boot:spring-boot-starter-test' implementation 'io.springfox:springfox-swagger-ui:3.0.0' + + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + implementation 'org.springframework.boot:spring-boot-devtools' + implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect' + + implementation 'org.webjars:bootstrap:5.1.3' + implementation 'org.webjars:jquery:3.6.0' + implementation 'org.webjars:font-awesome:6.1.0' } jar { manifest { diff --git a/data.mv.db b/data.mv.db index 0eb189930e43fbad5059060a5d3f30f636332005..f41c8186a44129e5aaebec2365ef347371fe053c 100644 GIT binary patch literal 65536 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 literal 45056 zcmeHQOKc;_d2UkTs8=&u?`ZZlYkSkno!OBRF5T7drV(H%iIO;?NDWD8HJczpKdMLC zkw`(JG@1p1EbPFD;e(Ndz1Tw%7z@K$*fDakV<5TskdqAqPJkG>7&*kqAwYsW4#_cp zKZpfgRJkRH>&4bqc z0!BG&8yl?x9QUx%!FB;@njqSyBZ*edY47bA9Z2L5@9l53TW)-38+WWtyjRe5MaR0% zk2CZ`5ugZA1SkR&0g3=cfFeKul}dg5bzVlntlr3;^kN+ExKcy2zc=2Yd;x=B^f*%&SZ) zJu;fPG{!zNe)-D8v!8kH>g2WOUwHAQm#@F_+0T9cRpvGBjrB&U$<5YF#b#+^X0=?I z;{?QKx$MLrru<*I)kdk#mFKx?t;vRLZm2e73lH*7mM}cY!jYqtysTXt}aXovOGOLeS>>#VkyXNrCwf! zi`-J_ZYZ-1psW^2nU#p>OYkt@#COO3_`iJyRB6mNKdCLq00 zS}v9=Nx(;Ms+1Orm5sAy=oav4g{-^UQgsWvUmb3NIxGyW4oXBF2vUAgO@S&L#;XE} zIFuSdE~iriB|8mja5$6}Y}8A4R!dOBi8=(LZ6sGHaz|X0@#)`$tUn=!B%%J6mRBmZ zyQLDzGdZvMa&1@@iZ9Z@2!twXNbK?H--7a99J;*KNO||3!>gM)DDVgI1>TK0REa}A zrz>$a`zFBt%M&VoP;eXbwK~+7+DfTjY?f=)lS={6tJl^_8*|WPWVvQ}85E|tyfURs z2k?T@c*b~G6X7>L$CHbig>qv9Oi6hSa-FHwDy3pI$Z%j`H}9^LHX5}iM2a{2p_YLd zj*wOaSKS0czm8AmL08s?))iqkqAZE%d%E)l(49X@#Vb$JokQu8E63@S3GNtu4xaV* zgJ)f>mcc|EYj{?dHiX6HmF2nSQhj|*uH0=dHCA+e>5i<_HoR79Lytf}Yzwg<*{Li! z^^kU3?FKhrt~Z*~qgMfuPCOvT(n&^Qkd#@@f3$unrbj2a*SiJXaLr?NHlg>i0hgg$ z)GXGU+}q{mB8NC=GJ8RhM}QmP=++Ky<}N4mqt_ty)d1R<)XB4*kTTL@l74=0(!>az zBsFy3j!FFjB;81sIzdHaa*D$7A{6t#CMZ6^f+$Hgxt!;hYD>-P+v_}lFBk7D%&yL$ zHF>G2&CX{zFnFc%Le=fqMaue&T3s*Am+G!sK*zY-D^0)vl-%tYf@y=k?CjF$OHj2s z0g}~12k+6pSJ>dVEo((HUgn-@y;JB#H;Q7s3+4rtq>orgY9 zUl{-@sc-}JHc_w$m=P)B08LD)_l&WChLVng`dI+=ebSvfuC6LyS*fqiS7f!ixVE}b zlQpfjwkWJG1UU+k79hEfgnRMF8-vdQ%D+lb-J~=J8H+@@BcMm6ibFjytsVxks3)lL z=K=AfL^Zy%DwJ;*MSV%oi|Unf}4@5BM)r!SIn43?He%@X_|xAzp^DBR=Pzt$3qGeBYoF3?2D{N>+4G z$sJSj29+c-sDuPT#7gdvnun{V=sg(|aKt?vu`iGA)sRj_(G_vC6Q>N#_IwJNW6>$hDp7}Fu6bT20%w2d{D5d zdYz|wou=@-@;Y1LrGLzfKKNU|5Wn(a?mm84&>TaM1zyS>8rua~Hxz?ck6TVG3`8H876)cNl_%{9I+vFfOH6$d0sd3&+xIt2Cyl9FJ z>bq}Y(QY!Bn_3@xP}|sP~&R$5H@^) zB}k+vFfV?eG+SnXuumo-uMaS=H=vWwfEwuxC|=`%RMQRtY|6TRDu7K-UQL(##Qm6v zo7B3%xI-A?{&x1v{g)7=A*GG)uL!3x)n4TxrrJ|XQ56Tbv&{R@&VCt8G#uq$c*oQS z>(FWZF*C9crh5eb-v7Y;Vn#EQU}NC;ClHN!iy8g+L-&Nq{HJ>#{ZIrb0%t+s82?V@ z(F1kfok#CzhT%xOc}^61D4FpffAXdw1&v~u|94+0eB%G)cZsg_y%&d2Zs&38^8asA z{-5&yl>d)s{G!BSJbySoP5J-On0*cq#uM&scVcB9jNDLykX`{|`8L z%Ky9WZb@VKL+KLb{}a6w2J!!Qlez8?TNcA__woNolaEvB=i>k%iZMx32LS2-FqI8A z;eF&DbpW6a0I^JI$fQvRfIe>_>Hsi=hf{J#WPT};ynmby0L&M!7E+f-nUwQU>L)1% zHI3cf_ExL2gIk^aJ>02goW*zHlldsMv~L^xwjgGHlA7Pyf#F`|#s5kVq?CG05}}lA zN+|*Dk?j89b6}5&Qu;MxXu6bL5q7Z|kN2ni|5<2TdJje5To5?MzlRv~9{;Zzwj=V^dGP1`X%POO z_(Lnl`G3#t+2{XH_IK_|-|Kz$XZWc@?p^{nncGY{m0}q6E#Gkoj^McT@^w~&N%^vF zTHu(pmpMwMUuIY&DwbtBm_-uI*9Z4X7TLOH8wSscNHRoN-+(3Fp{yjEqF_U0Nt0mJ z0&KF9BiKB|V`b!6nj&CU4tzV|M089+m004+$`W@`RzVu93834o${U)lK^Cga8@z-q zRy8nhS(?s*SDORQj5bT0K3Pq&RNj<$_c3(dMxu9uc#PZ=gGb2mpHOy;*V}vd@|!|_ z=WxH%-ots@%vTS#x7UpA13YJRjON2#e35Z-5qUaC`8D4$AKRW#u0S{D4GW}wcry|i zgs-*-TjQb449Rp)L_LbCRI(?n- zO%xbmRb7cFk|whTFCs9N0&B>+h-4d&8LH(- zg2NgZgW&E6iC?83{h4sJZ39kE|JCBnr!HT zDva4MYe3UQ_`wua*|AyMuuX(9oH*_xHWFg7q$1O@F^dgY&&4(EjwGqPq-$dicGq?h zhlARMgiW2hPH+*k>DBv6yLInORel&PJoiU<3KOI_$97JrCR_|GRQ)anXCY#op~0@S z%?5OLVfyQ`v3p}?yKUC7gZFUD!Z+OR@SDTjvJA6xz1YJPB=pY2iPuIhk9d6FP;4Je z_n5r$v(YO+5lYT?CK$AQ(6X_!)xvh%+1!=QzxX#Mv%kkY_pWhhxS7F&W_y2-%u)n`$wC0%S+{vlopKddw`_Kj-?fTtc@7wyt zSGWG<{!vD{4SeLjVfP;v;KvIP;`-lx?ed~{lyT-aH{ow#(>q*1#?v=`^}!#sk22qx zn73{JZ^5=N;*o#)4`1HA{yRsY5x+b6&CIhISYc0+9R`&J(Xsb0;L$(%^N;`d8?PTB z;r7vc)_X_R1!O7Z{{3fv^G`=8BQ3R@P50jgWcpWce(kH@|K}s%+%xj>=D`+suYK6s zy?~6rzH@bK@|u^iv-or5|GR*EOYgk%P5XbKGC}=*W%5UtCPBAga;uYZBmhB%|8ODm z+b_L4mYQNN!R(Vf;{5~i4}yOX{ezToqX^!&=zYuHx8i-PUL;lW53+yoFKJ!`-TOAZ zZ_E3(y>IM&JD1$azWI#_@2~~N@F3GLt;2$UqA_8(Ldwm(!o2s&@h1n&w637 z_U%ghULN%ah5n%EGoS>G_!-bJYUK`AdDFYeyIS}@Az=n|Fxr)TpPZDRHzt;RpPF=^ zCBqO}@_h+2!-K)azWY37DQtKpScsP38!p1Z+;%=@E_*PNc+-mpIs%1qJQjHco%R#! z7T@uhWE}E0yqMjBjeuaQ{nv#Pu15>aHoEeH>UvU;*JTeGGQjCSe4zQs!iHz$N3){y z|LOdHI{!am6_^fJ6^8X2b9Z~ow|9_$@ z%p*`w%K!V$JR$!73zYx&{F^BMpX8Eus(LsKq{{M>;&ySpKzAyLz{4ezbh&m%Y<$eI)qJ996&e7#5_XGG+q8~tw`T51{)1#O?!-{?Q8`v7rrLdi%VPC0d-bFVXTnvSvErD_}1Kf5YGb zOP=`K2%l;iVRx&SfL8Fsp{3J9TMYMR8itm4cVLH@Pl&K&abrBJtllmv!!CJz8d-a* zB8Oz<)$UaE=r+s*)qzXVciH~o_h%l2XK%~qu#DbP^giz+8Irr@OAyepyXA`?h}-hT zzY;7(9|SbP-SQuEnkMAqQ4X@ML!lSMepqp1543=J6MYTzyCg@A(a2;>H7Z{ z&*#z{DFUZKz~}!%{CkK&@6P|XOiePe{pjZZgU_zH-L~!*{9SzdwmN~WMEo7a%wQJ) z6zqNj+Z4GU*x9SQU60pX>pd?3EZ-^9n7D- zuk&5feIR`uvNi%~lw8|L*qxQP2P1 RvJDIyj-IzGJ-k+r{~u#PldAv# diff --git a/src/main/java/com/example/demo/WebConfiguration.java b/src/main/java/com/example/demo/WebConfiguration.java index a1bf9ed..77980d0 100644 --- a/src/main/java/com/example/demo/WebConfiguration.java +++ b/src/main/java/com/example/demo/WebConfiguration.java @@ -2,21 +2,20 @@ package com.example.demo; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpStatus; -import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.ViewControllerRegistration; -import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import org.springframework.web.servlet.config.annotation.*; @Configuration -class WebConfiguration implements WebMvcConfigurer { - @Override - public void addCorsMappings(CorsRegistry registry){ - registry.addMapping("/**").allowedMethods("*"); - } +public class WebConfiguration implements WebMvcConfigurer { + public static final String REST_API = "/api"; + @Override public void addViewControllers(ViewControllerRegistry registry) { - ViewControllerRegistration registration = registry.addViewController("/notFound"); - registration.setViewName("forward:/index.html"); - registration.setStatusCode(HttpStatus.OK); + WebMvcConfigurer.super.addViewControllers(registry); + registry.addViewController("appointment"); + } + + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**").allowedMethods("*"); } } diff --git a/src/main/java/com/example/demo/speaker/controller/AppointmentController.java b/src/main/java/com/example/demo/speaker/controller/AppointmentController.java index 59a7f32..e8ca6d4 100644 --- a/src/main/java/com/example/demo/speaker/controller/AppointmentController.java +++ b/src/main/java/com/example/demo/speaker/controller/AppointmentController.java @@ -1,9 +1,8 @@ package com.example.demo.speaker.controller; +import com.example.demo.speaker.controller.DTO.AppointmentDTO; import com.example.demo.speaker.model.Appointment; import com.example.demo.speaker.service.AppointmentService; -import com.example.demo.speaker.service.RequestForCooperationService; -import org.springframework.dao.DataIntegrityViolationException; import org.springframework.web.bind.annotation.*; //import javax.validation.Valid; diff --git a/src/main/java/com/example/demo/speaker/controller/CompanyController.java b/src/main/java/com/example/demo/speaker/controller/CompanyController.java index 59c65d8..a3f217d 100644 --- a/src/main/java/com/example/demo/speaker/controller/CompanyController.java +++ b/src/main/java/com/example/demo/speaker/controller/CompanyController.java @@ -1,16 +1,10 @@ package com.example.demo.speaker.controller; -import com.example.demo.speaker.model.Appointment; +import com.example.demo.speaker.controller.DTO.CompanyDTO; import com.example.demo.speaker.model.Company; -import com.example.demo.speaker.model.Employee; -import com.example.demo.speaker.model.RequestForCooperation; -import com.example.demo.speaker.service.AppointmentService; import com.example.demo.speaker.service.CompanyService; -import com.example.demo.speaker.service.EmployeeService; -import com.example.demo.speaker.service.RequestForCooperationService; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; import java.util.List; @RestController @@ -39,7 +33,7 @@ public class CompanyController { return new CompanyDTO(companyService.deleteCompany(id)); } - @DeleteMapping + @DeleteMapping("/remove") public void removeAllCompanies() { companyService.deleteAllCompanies(); } diff --git a/src/main/java/com/example/demo/speaker/controller/AppointmentDTO.java b/src/main/java/com/example/demo/speaker/controller/DTO/AppointmentDTO.java similarity index 89% rename from src/main/java/com/example/demo/speaker/controller/AppointmentDTO.java rename to src/main/java/com/example/demo/speaker/controller/DTO/AppointmentDTO.java index 6c46ffc..14c16da 100644 --- a/src/main/java/com/example/demo/speaker/controller/AppointmentDTO.java +++ b/src/main/java/com/example/demo/speaker/controller/DTO/AppointmentDTO.java @@ -1,4 +1,4 @@ -package com.example.demo.speaker.controller; +package com.example.demo.speaker.controller.DTO; import com.example.demo.speaker.model.Appointment; diff --git a/src/main/java/com/example/demo/speaker/controller/CompanyDTO.java b/src/main/java/com/example/demo/speaker/controller/DTO/CompanyDTO.java similarity index 95% rename from src/main/java/com/example/demo/speaker/controller/CompanyDTO.java rename to src/main/java/com/example/demo/speaker/controller/DTO/CompanyDTO.java index 46db78d..3706861 100644 --- a/src/main/java/com/example/demo/speaker/controller/CompanyDTO.java +++ b/src/main/java/com/example/demo/speaker/controller/DTO/CompanyDTO.java @@ -1,4 +1,4 @@ -package com.example.demo.speaker.controller; +package com.example.demo.speaker.controller.DTO; import com.example.demo.speaker.model.Company; import com.example.demo.speaker.model.RequestForCooperation; diff --git a/src/main/java/com/example/demo/speaker/controller/EmployeeDTO.java b/src/main/java/com/example/demo/speaker/controller/DTO/EmployeeDTO.java similarity index 71% rename from src/main/java/com/example/demo/speaker/controller/EmployeeDTO.java rename to src/main/java/com/example/demo/speaker/controller/DTO/EmployeeDTO.java index b5388c5..90e7b86 100644 --- a/src/main/java/com/example/demo/speaker/controller/EmployeeDTO.java +++ b/src/main/java/com/example/demo/speaker/controller/DTO/EmployeeDTO.java @@ -1,10 +1,6 @@ -package com.example.demo.speaker.controller; +package com.example.demo.speaker.controller.DTO; -import com.example.demo.speaker.model.Appointment; import com.example.demo.speaker.model.Employee; -import jakarta.persistence.Column; -import jakarta.persistence.FetchType; -import jakarta.persistence.OneToOne; public class EmployeeDTO { private Long id; diff --git a/src/main/java/com/example/demo/speaker/controller/RequestForCooperationDTO.java b/src/main/java/com/example/demo/speaker/controller/DTO/RequestForCooperationDTO.java similarity index 86% rename from src/main/java/com/example/demo/speaker/controller/RequestForCooperationDTO.java rename to src/main/java/com/example/demo/speaker/controller/DTO/RequestForCooperationDTO.java index b982e80..f24b534 100644 --- a/src/main/java/com/example/demo/speaker/controller/RequestForCooperationDTO.java +++ b/src/main/java/com/example/demo/speaker/controller/DTO/RequestForCooperationDTO.java @@ -1,12 +1,8 @@ -package com.example.demo.speaker.controller; +package com.example.demo.speaker.controller.DTO; import com.example.demo.speaker.model.Company; -import com.example.demo.speaker.model.Employee; import com.example.demo.speaker.model.RequestForCooperation; import com.example.demo.speaker.model.TypeOfRequestEnum; -import jakarta.persistence.Column; -import jakarta.persistence.FetchType; -import jakarta.persistence.OneToOne; import java.util.Date; diff --git a/src/main/java/com/example/demo/speaker/controller/EmployeeController.java b/src/main/java/com/example/demo/speaker/controller/EmployeeController.java index ddb30f8..f41e4c4 100644 --- a/src/main/java/com/example/demo/speaker/controller/EmployeeController.java +++ b/src/main/java/com/example/demo/speaker/controller/EmployeeController.java @@ -1,5 +1,6 @@ package com.example.demo.speaker.controller; +import com.example.demo.speaker.controller.DTO.EmployeeDTO; import com.example.demo.speaker.model.Appointment; import com.example.demo.speaker.model.RequestForCooperation; import com.example.demo.speaker.model.Employee; @@ -8,7 +9,6 @@ import com.example.demo.speaker.service.RequestForCooperationService; import com.example.demo.speaker.service.EmployeeService; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; import java.util.List; @RestController @RequestMapping("/employee") diff --git a/src/main/java/com/example/demo/speaker/controller/MVCController/AppointmentMVCController.java b/src/main/java/com/example/demo/speaker/controller/MVCController/AppointmentMVCController.java new file mode 100644 index 0000000..f3e3fca --- /dev/null +++ b/src/main/java/com/example/demo/speaker/controller/MVCController/AppointmentMVCController.java @@ -0,0 +1,59 @@ +package com.example.demo.speaker.controller.MVCController; + +import com.example.demo.speaker.controller.DTO.AppointmentDTO; +import com.example.demo.speaker.model.Appointment; +import com.example.demo.speaker.service.AppointmentService; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import java.util.Random; + +@Controller +@RequestMapping("/appointment") +public class AppointmentMVCController +{ + private final AppointmentService appointmentService; + + public AppointmentMVCController(AppointmentService appointmentService) { + this.appointmentService = appointmentService; + } + + @GetMapping + public String getAppointments(Model model) { + model.addAttribute("appointments", + appointmentService.findAllAppointments().stream() + .map(AppointmentDTO::new) + .toList()); + return "appointment"; + } + + @PostMapping("/create") + public String createAppointment(String name, Model model){ + + Random r = new Random(); + var app = new Appointment(r.nextLong(), name); + appointmentService.addAppointment(new AppointmentDTO(app)); + model.addAttribute("appointmentName", name); + model.addAttribute("appointmentDTO", new AppointmentDTO(appointmentService.addAppointment(new AppointmentDTO(app)))); + return "redirect:/appointment"; + + } + + @PostMapping("edit/{id}") + public String updateMVCAppointment(@PathVariable Long id, @ModelAttribute("appointment") AppointmentDTO appointment, + Model model) { + //appointmentService.updateAppointment(id, appointment); + model.addAttribute("appointmentId", id); + model.addAttribute("appointmentDTO", new AppointmentDTO(appointmentService.updateAppointment(id,appointment))); + return "redirect:/appointment"; + } + + @PostMapping("delete/{id}") + public String deleteAppointment(@PathVariable Long id) { + appointmentService.deleteAppointment(id); + return "redirect:/appointment"; + } +} + diff --git a/src/main/java/com/example/demo/speaker/controller/MVCController/CompanyMVCController.java b/src/main/java/com/example/demo/speaker/controller/MVCController/CompanyMVCController.java new file mode 100644 index 0000000..26f2eb7 --- /dev/null +++ b/src/main/java/com/example/demo/speaker/controller/MVCController/CompanyMVCController.java @@ -0,0 +1,48 @@ +package com.example.demo.speaker.controller.MVCController; + +import com.example.demo.speaker.controller.DTO.CompanyDTO; +import com.example.demo.speaker.model.Company; +import com.example.demo.speaker.service.CompanyService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; +import org.springframework.ui.Model; + +import java.util.List; + +@Controller +@RequestMapping("/company") +public class CompanyMVCController { + private final CompanyService companyService; + + public CompanyMVCController(CompanyService _companyService) { + this.companyService = _companyService; + } + @PostMapping("/create") + public CompanyDTO addCompany(@RequestParam("name") String name, @RequestParam("legalAdressCompany") String legalAdressCompany, + @RequestParam("adressCompany") String adressCompany, + @RequestParam("contactEmail") String contactEmail) { + var company = new Company(name, legalAdressCompany, adressCompany, contactEmail); + return new CompanyDTO(companyService.addCompany(new CompanyDTO(company))); + } + + @PutMapping("/edit/{id}") + public String updateCompany(@PathVariable Long id, @ModelAttribute CompanyDTO companyDTO) { + companyService.updateCompany(id,companyDTO); + return "redirect:company"; + } + + @PostMapping("delete/{id}") + public String removeCompany(@PathVariable Long id) { + companyService.deleteCompany(id); + return "company"; + } + + @GetMapping + public String findAllCompanies(Model model) { + model.addAttribute("companies", companyService.findAllCompanies() + .stream() + .map(CompanyDTO::new) + .toList()); + return "company"; + } +} diff --git a/src/main/java/com/example/demo/speaker/controller/MVCController/EmployeeMVCController.java b/src/main/java/com/example/demo/speaker/controller/MVCController/EmployeeMVCController.java new file mode 100644 index 0000000..d655cd9 --- /dev/null +++ b/src/main/java/com/example/demo/speaker/controller/MVCController/EmployeeMVCController.java @@ -0,0 +1,62 @@ +package com.example.demo.speaker.controller.MVCController; + +import com.example.demo.speaker.controller.DTO.AppointmentDTO; +import com.example.demo.speaker.controller.DTO.EmployeeDTO; +import com.example.demo.speaker.model.Appointment; +import com.example.demo.speaker.model.Employee; +import com.example.demo.speaker.service.AppointmentService; +import com.example.demo.speaker.service.EmployeeService; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; +import org.springframework.ui.Model; + +import java.util.List; +import java.util.stream.Collectors; + +@Controller +@RequestMapping("/employee") +public class EmployeeMVCController { + private final EmployeeService employeeService; + private final AppointmentService appointmentService; + + public List appointments; + + + public EmployeeMVCController(EmployeeService employeeService, AppointmentService appointmentService) { + this.employeeService = employeeService; + this.appointmentService = appointmentService; + this.appointments = appointmentService.findAllAppointments(); + } + + @GetMapping + public String getWorkers(Model model) { + model.addAttribute("employees", + employeeService.findAllWorkers().stream() + .map(EmployeeDTO::new) + .toList()); + model.addAttribute("appointments", + appointmentService.findAllAppointments().stream().map(AppointmentDTO::new).toList()); + return "employee"; + } + + @PostMapping("/create") + public String createWorker(@RequestParam("name") String name, @RequestParam("appointmentId") Long appointmentId, Model model) { + var Employee = new Employee(name, appointmentService.findAppointment(appointmentId)); + model.addAttribute("employee",new EmployeeDTO(employeeService.addWorker(new EmployeeDTO(Employee)))); + return "redirect:employee"; + } + + @PostMapping("/edit/{id}") + public String updateWorker(@PathVariable Long id,@ModelAttribute("employee") EmployeeDTO employee, Model model) { + employeeService.updateReportWorker(id, employee); + model.addAttribute("employees", employeeService.findAllWorkers()); + model.addAttribute("appointments", appointmentService.findAllAppointments()); + return "redirect:employee"; + } + + @PostMapping("/delete/{id}") + public String deleteWorker(@PathVariable Long id) { + employeeService.deleteWorker(id); + return "redirect:/employee"; + } +} diff --git a/src/main/java/com/example/demo/speaker/controller/MVCController/RequestMVCController.java b/src/main/java/com/example/demo/speaker/controller/MVCController/RequestMVCController.java new file mode 100644 index 0000000..6d98f01 --- /dev/null +++ b/src/main/java/com/example/demo/speaker/controller/MVCController/RequestMVCController.java @@ -0,0 +1,83 @@ +package com.example.demo.speaker.controller.MVCController; + +import com.example.demo.speaker.controller.DTO.CompanyDTO; +import com.example.demo.speaker.controller.DTO.EmployeeDTO; +import com.example.demo.speaker.controller.DTO.RequestForCooperationDTO; +import com.example.demo.speaker.model.Company; +import com.example.demo.speaker.model.Employee; +import com.example.demo.speaker.model.RequestForCooperation; +import com.example.demo.speaker.model.TypeOfRequestEnum; +import com.example.demo.speaker.service.CompanyService; +import com.example.demo.speaker.service.EmployeeService; +import com.example.demo.speaker.service.RequestForCooperationService; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; + +import java.util.Date; +import java.util.List; + +@Controller +@RequestMapping("/request") +public class RequestMVCController { + private final RequestForCooperationService requestForCooperationService; + private final CompanyService companyService; + private final EmployeeService employeeService; + List types; + List employees; + List companies; + + public RequestMVCController(RequestForCooperationService requestForCooperationService, CompanyService companyService, EmployeeService employeeService) { + this.requestForCooperationService = requestForCooperationService; + this.companyService = companyService; + this.employeeService = employeeService; + this.types = List.of(TypeOfRequestEnum.TRACKING, TypeOfRequestEnum.DEVELOP); + employees = employeeService.findAllWorkers(); + companies = companyService.findAllCompanies(); + } + + + @GetMapping + public String getRequests(Model model) { + model.addAttribute("requests", requestForCooperationService.findAllRequests() + .stream().map(RequestForCooperationDTO::new).toList()); + model.addAttribute("types", types); + model.addAttribute("employees", employees.stream() + .map(EmployeeDTO::new).toList()); + model.addAttribute("companies", companies.stream() + .map(CompanyDTO::new).toList()); + return "request"; + } + + @PostMapping("/add") + public String createRequest(@PathVariable Long nameCompany, + @PathVariable String comment, + @PathVariable Integer isActive, + @PathVariable Long sort, + @PathVariable Long type, + Model model + ){ + + //@RequestBody RequestForCooperationDTO requestDTO) { + var company = companyService.findCompany(nameCompany); + var emp = employeeService.findWorker(sort); + var request = new RequestForCooperation(company, new Date(), type == 0 ? TypeOfRequestEnum.DEVELOP : TypeOfRequestEnum.TRACKING, comment); + requestForCooperationService.addRequest(new RequestForCooperationDTO(request)); + return "redirect:request"; + } + + @PutMapping("/{id}") + public String updateRequest(@PathVariable Long id, + @ModelAttribute RequestForCooperationDTO request, + Model model) { + requestForCooperationService.updateRequest(request); + return "redirect:request"; + } + + @PostMapping("/delete/{id}") + public String deleteRequest(@PathVariable Long id, Model model) { + requestForCooperationService.deleteRequest(id); + return "redirect:request"; + } + +} diff --git a/src/main/java/com/example/demo/speaker/controller/RequestForCooperationController.java b/src/main/java/com/example/demo/speaker/controller/RequestForCooperationController.java index 2ff3e50..552bbda 100644 --- a/src/main/java/com/example/demo/speaker/controller/RequestForCooperationController.java +++ b/src/main/java/com/example/demo/speaker/controller/RequestForCooperationController.java @@ -1,5 +1,6 @@ package com.example.demo.speaker.controller; +import com.example.demo.speaker.controller.DTO.RequestForCooperationDTO; import com.example.demo.speaker.model.RequestForCooperation; import com.example.demo.speaker.model.TypeOfRequestEnum; import com.example.demo.speaker.service.CompanyService; diff --git a/src/main/java/com/example/demo/speaker/service/AppointmentService.java b/src/main/java/com/example/demo/speaker/service/AppointmentService.java index 67b37f6..068379a 100644 --- a/src/main/java/com/example/demo/speaker/service/AppointmentService.java +++ b/src/main/java/com/example/demo/speaker/service/AppointmentService.java @@ -1,6 +1,6 @@ package com.example.demo.speaker.service; -import com.example.demo.speaker.controller.AppointmentDTO; +import com.example.demo.speaker.controller.DTO.AppointmentDTO; import com.example.demo.speaker.model.Appointment; import com.example.demo.speaker.repository.IAppointmentRepository; import org.springframework.stereotype.Service; @@ -8,7 +8,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Optional; -import java.util.Random; @Service public class AppointmentService { diff --git a/src/main/java/com/example/demo/speaker/service/CompanyService.java b/src/main/java/com/example/demo/speaker/service/CompanyService.java index f6f75ff..0269fea 100644 --- a/src/main/java/com/example/demo/speaker/service/CompanyService.java +++ b/src/main/java/com/example/demo/speaker/service/CompanyService.java @@ -1,14 +1,11 @@ package com.example.demo.speaker.service; -import com.example.demo.speaker.controller.CompanyDTO; +import com.example.demo.speaker.controller.DTO.CompanyDTO; import com.example.demo.speaker.model.Company; import com.example.demo.speaker.model.RequestForCooperation; -import com.example.demo.speaker.model.TypeOfRequestEnum; import com.example.demo.speaker.repository.ICompanyRepository; -import jakarta.persistence.EntityNotFoundException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.StringUtils; import java.util.List; import java.util.Optional; diff --git a/src/main/java/com/example/demo/speaker/service/EmployeeService.java b/src/main/java/com/example/demo/speaker/service/EmployeeService.java index 7f72201..a8efd39 100644 --- a/src/main/java/com/example/demo/speaker/service/EmployeeService.java +++ b/src/main/java/com/example/demo/speaker/service/EmployeeService.java @@ -1,6 +1,6 @@ package com.example.demo.speaker.service; -import com.example.demo.speaker.controller.EmployeeDTO; +import com.example.demo.speaker.controller.DTO.EmployeeDTO; import com.example.demo.speaker.model.Appointment; import com.example.demo.speaker.model.Employee; import com.example.demo.speaker.model.RequestForCooperation; diff --git a/src/main/java/com/example/demo/speaker/service/RequestForCooperationService.java b/src/main/java/com/example/demo/speaker/service/RequestForCooperationService.java index 309cfc4..0b5e217 100644 --- a/src/main/java/com/example/demo/speaker/service/RequestForCooperationService.java +++ b/src/main/java/com/example/demo/speaker/service/RequestForCooperationService.java @@ -1,7 +1,6 @@ package com.example.demo.speaker.service; -import com.example.demo.speaker.controller.CompanyDTO; -import com.example.demo.speaker.controller.RequestForCooperationDTO; +import com.example.demo.speaker.controller.DTO.RequestForCooperationDTO; import com.example.demo.speaker.model.Company; import com.example.demo.speaker.model.Employee; import com.example.demo.speaker.model.RequestForCooperation; diff --git a/src/main/resources/templates/appointment.html b/src/main/resources/templates/appointment.html new file mode 100644 index 0000000..212a7f3 --- /dev/null +++ b/src/main/resources/templates/appointment.html @@ -0,0 +1,47 @@ + + + + + +
+
+ + + + + + + + + + + + + + + +
IDИмя
+ +
+ + + +
+ +
+ +
+
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/company.html b/src/main/resources/templates/company.html new file mode 100644 index 0000000..ccd969a --- /dev/null +++ b/src/main/resources/templates/company.html @@ -0,0 +1,50 @@ + + + + + +
+
+ + + + + + + + + + + + + + + +
IDКомпания
+ +
+ + + + + + +
+ +
+ +
+
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html new file mode 100644 index 0000000..6627988 --- /dev/null +++ b/src/main/resources/templates/default.html @@ -0,0 +1,50 @@ + + + + + Site of Company + + + + + + + + + +
+
+
+
+ + + + \ No newline at end of file diff --git a/src/main/resources/templates/employee.html b/src/main/resources/templates/employee.html new file mode 100644 index 0000000..7efba38 --- /dev/null +++ b/src/main/resources/templates/employee.html @@ -0,0 +1,54 @@ + + + + + +
+
+ + + + + + + + + + + + + + + +
IDИмя
+ +
+ + + + + + +
+ +
+ +
+
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html new file mode 100644 index 0000000..ba36613 --- /dev/null +++ b/src/main/resources/templates/index.html @@ -0,0 +1,12 @@ + + + + + +
+

It's works!

+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/request.html b/src/main/resources/templates/request.html new file mode 100644 index 0000000..4d542d2 --- /dev/null +++ b/src/main/resources/templates/request.html @@ -0,0 +1,67 @@ + + + + + +
+
+ + + + + + + + + + + + + + + +
IDЗаявка
+ +
+ + + + + + + + + + + +
+ +
+ +
+
+
+
+ + \ No newline at end of file diff --git a/src/test/java/com/example/demo/JPATests.java b/src/test/java/com/example/demo/JPATests.java index 765771a..116587c 100644 --- a/src/test/java/com/example/demo/JPATests.java +++ b/src/test/java/com/example/demo/JPATests.java @@ -1,27 +1,8 @@ package com.example.demo; -import com.example.demo.speaker.controller.AppointmentDTO; -import com.example.demo.speaker.model.*; -import com.example.demo.speaker.service.CompanyService; -import com.example.demo.speaker.service.RequestForCooperationService; -import com.example.demo.speaker.service.AppointmentService; -import com.example.demo.speaker.service.EmployeeService; -import jakarta.persistence.EntityNotFoundException; -import jakarta.transaction.Transactional; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.List; -import java.util.Locale; -import java.util.stream.Stream; - @SpringBootTest public class JPATests {