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

Timestamp:

01/09/24 01:26:08 (11 months ago)

Author:

ppaunovski <paunovskipavel@…>

Branches:

master

Children:

e272096

Parents:

b101b69

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) (4 diffs)
• InstancaNaLinijaController.java (added)
• KaznaController.java (added)
• KontrolaController.java (added)
• RegisterController.java (modified) (4 diffs)
• VozenjeController.java (added)

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

@@ -1 +1 @@
 package mk.ukim.finki.busngo.web;
 
+import mk.ukim.finki.busngo.model.entities.Patnik;
 import mk.ukim.finki.busngo.model.enums.BILET_STATUS;
+import mk.ukim.finki.busngo.model.exceptions.InvalidPatnikIdException;
 import mk.ukim.finki.busngo.service.AuthService;
 import mk.ukim.finki.busngo.service.BiletService;
+import mk.ukim.finki.busngo.service.PatnikService;
 import mk.ukim.finki.busngo.service.TipBiletService;
 import org.springframework.security.core.Authentication;
@@ -21 +24 @@
     private final TipBiletService tipBiletService;
     private final AuthService authService;
+    private final PatnikService patnikService;
 
-    public BiletController(BiletService biletService, TipBiletService tipBiletService, AuthService authService) {
+    public BiletController(BiletService biletService, TipBiletService tipBiletService, AuthService authService, PatnikService patnikService) {
         this.biletService = biletService;
         this.tipBiletService = tipBiletService;
         this.authService = authService;
+        this.patnikService = patnikService;
     }
 
@@ -31 +36 @@
     public String getAllBileti(@RequestParam(required = false) Long id,
                                @RequestParam(required = false) BILET_STATUS status,
-                               Model model){
+                               Model model,
+                               Authentication authentication){
         model.addAttribute("bodyContent", "listBileti");
-        model.addAttribute("bileti", biletService.listAll());
+        Patnik patnik = null;
+        try{
+            model.addAttribute("bileti", biletService.findAllByPatnikEmail(authentication.getName()));
+        }
+        catch (InvalidPatnikIdException e){
+            model.addAttribute("bodyContent", "listBileti");
+            model.addAttribute("hasError", true);
+            model.addAttribute("error", e.getMessage());
+            return "master-template";
+        }
+
         return "master-template";
     }
@@ -50 +66 @@
     }
 
+//    @GetMapping("/encode")
+//    public String encode(){
+//        biletService.encode();
+//        return "redirect:/bilet";
+//    }
+
 }

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

@@ -1 +1 @@
 package mk.ukim.finki.busngo.web;
 
-import mk.ukim.finki.busngo.model.enums.Role;
+import mk.ukim.finki.busngo.model.entities.Korisnik;
 import mk.ukim.finki.busngo.model.exceptions.InvalidCredentialsException;
 import mk.ukim.finki.busngo.model.exceptions.UserAlreadyExistsException;
 import mk.ukim.finki.busngo.service.AuthService;
 import mk.ukim.finki.busngo.service.KorisnikService;
+import mk.ukim.finki.busngo.service.PatnikService;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -18 +19 @@
     private final AuthService authService;
     private final KorisnikService korisnikService;
+    private final PatnikService patnikService;
 
-    public RegisterController(AuthService authService, KorisnikService korisnikService) {
+    public RegisterController(AuthService authService, KorisnikService korisnikService, PatnikService patnikService) {
         this.authService = authService;
         this.korisnikService = korisnikService;
+        this.patnikService = patnikService;
     }
 
@@ -44 +47 @@
     ) {
         try{
-            this.authService.register(name, email, password, confirmPassword, address, phone);
+            Korisnik korisnik = this.authService.registerPatnik(name, email, password, confirmPassword, address, phone);
+            this.patnikService.save(korisnik);
             return "redirect:/login";
         } catch (InvalidCredentialsException | UserAlreadyExistsException exception) {
@@ -51 +55 @@
     }
 
+//    @PostMapping
+//    public String registerVraboten(@RequestParam String name,
+//                                   @RequestParam String email,
+//                                   @RequestParam String password,
+//                                   @RequestParam String confirmPassword,
+//                                   @RequestParam String address,
+//                                   @RequestParam String phone){
+//
+//    }
+
 }