Changeset e272096 for src/main/java/mk/ukim/finki/busngo/web

Timestamp:

02/18/24 22:01:54 (5 months ago)

Author:

ppaunovski <paunovskipavel@…>

Branches:

master

Children:

4251327

Parents:

bde8b13

Message:

All 3 main use cases implemented.

1. Starting a commute
2. Writing a ticket
3. Starting an instance of a Bus Line

Location:

src/main/java/mk/ukim/finki/busngo/web

Files:

• BiletController.java (modified) (1 diff)
• InstancaNaLinijaController.java (modified) (1 diff)
• KaznaController.java (modified) (2 diffs)
• RegisterController.java (modified) (3 diffs)
• VozenjeController.java (modified) (2 diffs)

src/main/java/mk/ukim/finki/busngo/web/BiletController.java

@@ -41 +41 @@
         Patnik patnik = null;
         try{
+            patnik = patnikService.loadUserByEmail(authentication.getName());
             model.addAttribute("bileti", biletService.findAllByPatnikEmail(authentication.getName()));
         }

src/main/java/mk/ukim/finki/busngo/web/InstancaNaLinijaController.java

@@ -71 +71 @@
 
     @PostMapping("/{inlId}/end")
-    public String endInstanca(@PathVariable Long inlId){
-        Instancanalinija ended = instancaNaLinijaService.end(inlId);
+    public String endInstanca(@PathVariable Long inlId,
+                              Authentication authentication){
+        Instancanalinija ended = instancaNaLinijaService.end(inlId, authentication.getName());
         return "redirect:/instanca-na-linija/" + ended.getInlId();
     }

src/main/java/mk/ukim/finki/busngo/web/KaznaController.java

@@ -9 +9 @@
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -37 +39 @@
         return "master-template";
     }
+
+    @PostMapping("/{id}/pay")
+    public String pay(@PathVariable Long id,
+                      Model model){
+        kaznaZaRegistriranService.pay(id);
+        return "redirect:/kazna";
+    }
+
 }

src/main/java/mk/ukim/finki/busngo/web/RegisterController.java

@@ -2 +2 @@
 
 import mk.ukim.finki.busngo.model.entities.Korisnik;
+import mk.ukim.finki.busngo.model.enums.VrabotenType;
 import mk.ukim.finki.busngo.model.exceptions.InvalidCredentialsException;
 import mk.ukim.finki.busngo.model.exceptions.UserAlreadyExistsException;
@@ -34 +35 @@
         }
 
+        model.addAttribute("types", VrabotenType.values());
+
         model.addAttribute("bodyContent", "register");
         return "master-template";
@@ -44 +47 @@
                            @RequestParam String confirmPassword,
                            @RequestParam String address,
-                           @RequestParam String phone
-    ) {
+                           @RequestParam String phone,
+                           @RequestParam(required = false)VrabotenType vrabotenType,
+                           @RequestParam(required = false) Double salary
+                           ) {
         try{
-            Korisnik korisnik = this.authService.registerPatnik(name, email, password, confirmPassword, address, phone);
-            this.patnikService.save(korisnik);
+            Korisnik korisnik;
+            if(vrabotenType != null){
+                 korisnik = this.authService.registerVraboten(name, email, password, confirmPassword, address, phone, vrabotenType, salary);
+
+            }
+            else
+                korisnik = this.authService.registerPatnik(name, email, password, confirmPassword, address, phone);
             return "redirect:/login";
         } catch (InvalidCredentialsException | UserAlreadyExistsException exception) {

src/main/java/mk/ukim/finki/busngo/web/VozenjeController.java

@@ -4 +4 @@
 import mk.ukim.finki.busngo.model.entities.Patnik;
 import mk.ukim.finki.busngo.model.entities.Vozenje;
+import mk.ukim.finki.busngo.model.enums.VOZENJE_STATUS;
 import mk.ukim.finki.busngo.model.exceptions.InvalidPatnikIdException;
 import mk.ukim.finki.busngo.model.exceptions.InvalidPostojkaNaLinijaIdException;
@@ -29 +30 @@
     @GetMapping()
     public String getVozenjePage(Model model,
-                                 Authentication authentication){
+                                 Authentication authentication,
+                                 @RequestParam(required = false) VOZENJE_STATUS status){
         model.addAttribute("bodyContent", "listVozenja");
         Patnik patnik = null;
         try{
-            model.addAttribute("vozenja", vozenjeService.findVozenjaByPatnik(authentication.getName()));
+            if(status != null)
+                model.addAttribute("vozenja", vozenjeService.findVozenjaByPatnikAndStatus(authentication.getName(), status));
+            else
+                model.addAttribute("vozenja", vozenjeService.findVozenjaByPatnikAndStatus(authentication.getName(), VOZENJE_STATUS.ACTIVE));
+            model.addAttribute("vozStatus", VOZENJE_STATUS.values());
         }
         catch (InvalidPatnikIdException e){