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

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/service

Files:

• AuthService.java (modified) (1 diff)
• AvtobusService.java (added)
• BiletService.java (modified) (2 diffs)
• InstancaNaLinijaService.java (added)
• KaznaService.java (added)
• KaznaZaNeregistriranService.java (added)
• KaznaZaRegistriranService.java (added)
• KondukterService.java (added)
• KontrolaService.java (added)
• LinijaService.java (added)
• PatnikService.java (modified) (2 diffs)
• PostojkaNaLinijaService.java (added)
• VozacService.java (added)
• VozenjeService.java (added)
• impl/AuthServiceImpl.java (modified) (4 diffs)
• impl/AvtobusServiceImpl.java (added)
• impl/BiletServiceImpl.java (modified) (5 diffs)
• impl/InstancaNaLinijaServiceImpl.java (added)
• impl/KaznaServiceImpl.java (added)
• impl/KaznaZaNeregistriranServiceImpl.java (added)
• impl/KaznaZaRegistriranServiceImpl.java (added)
• impl/KondukterServiceImpl.java (added)
• impl/KontrolaServiceImpl.java (added)
• impl/LinijaServiceImpl.java (added)
• impl/PatnikServiceImpl.java (modified) (3 diffs)
• impl/PostojkaNaLinijaServiceImpl.java (added)
• impl/VozacServiceImpl.java (added)
• impl/VozenjeServiceImpl.java (added)

src/main/java/mk/ukim/finki/busngo/service/AuthService.java

@@ -5 +5 @@
 public interface AuthService {
     Korisnik login(String email, String password);
-    Korisnik register(String ime, String email, String password, String confirmPassword, String address, String telefon);
+    Korisnik registerPatnik(String ime, String email, String password, String confirmPassword, String address, String telefon);
 
 }

src/main/java/mk/ukim/finki/busngo/service/BiletService.java

@@ -2 +2 @@
 
 import mk.ukim.finki.busngo.model.entities.Bilet;
+import mk.ukim.finki.busngo.model.entities.Patnik;
 import mk.ukim.finki.busngo.model.enums.BILET_STATUS;
 
@@ -13 +14 @@
 
     Bilet buy(Long tipbilet, LocalDateTime now, BILET_STATUS biletStatus, String name);
+
+    List<Bilet> findAllByPatnikEmail(String email);
+    Bilet findBybIdAndPatnikEmail(Long bId, String email);
+
+    Bilet activate(Long bId);
+    Bilet findById(Long bId);
+    Bilet finish(Long bId);
+
+    boolean checkExpiration(Long bId);
+//    void encode();
 }

src/main/java/mk/ukim/finki/busngo/service/PatnikService.java

@@ -2 +2 @@
 
 import mk.ukim.finki.busngo.model.entities.Bilet;
+import mk.ukim.finki.busngo.model.entities.Korisnik;
 import mk.ukim.finki.busngo.model.entities.Patnik;
 
@@ -9 +10 @@
     List<Patnik> listAll();
     Patnik findById(Long id);
+    Patnik loadUserByEmail(String email);
+
+    Patnik save(Korisnik korisnik);
 
 }

src/main/java/mk/ukim/finki/busngo/service/impl/AuthServiceImpl.java

@@ -2 +2 @@
 
 import mk.ukim.finki.busngo.model.entities.Korisnik;
+import mk.ukim.finki.busngo.model.entities.Patnik;
 import mk.ukim.finki.busngo.model.exceptions.InvalidCredentialsException;
 import mk.ukim.finki.busngo.model.exceptions.UserAlreadyExistsException;
 import mk.ukim.finki.busngo.repository.KorisnikRepository;
+import mk.ukim.finki.busngo.repository.PatnikRepository;
 import mk.ukim.finki.busngo.service.AuthService;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 @Service
 public class AuthServiceImpl implements AuthService {
     private final KorisnikRepository korisnikRepository;
+    private final PatnikRepository patnikRepository;
     private final PasswordEncoder passwordEncoder;
 
-    public AuthServiceImpl(KorisnikRepository korisnikRepository, PasswordEncoder passwordEncoder) {
+    public AuthServiceImpl(KorisnikRepository korisnikRepository, PatnikRepository patnikRepository, PasswordEncoder passwordEncoder) {
         this.korisnikRepository = korisnikRepository;
+        this.patnikRepository = patnikRepository;
         this.passwordEncoder = passwordEncoder;
     }
@@ -29 +31 @@
 
     @Override
-    public Korisnik register(String ime, String email, String password, String confirmPassword, String address, String telefon) {
+    public Korisnik registerPatnik(String ime, String email, String password, String confirmPassword, String address, String telefon) {
         if (email == null || password == null || email.isEmpty() || password.isEmpty()) {
             throw new InvalidCredentialsException();
@@ -42 +44 @@
         }
 
-        Korisnik korisnik = new Korisnik();
+        Patnik korisnik = new Patnik();
         korisnik.setKIme(ime);
         korisnik.setKAdresa(address);
@@ -50 +52 @@
         korisnik.setKIsAdmin(false);
 
-        return korisnikRepository.save(korisnik);
+
+        return patnikRepository.save(korisnik);
     }
 

src/main/java/mk/ukim/finki/busngo/service/impl/BiletServiceImpl.java

@@ -3 +3 @@
 import mk.ukim.finki.busngo.model.entities.Bilet;
 import mk.ukim.finki.busngo.model.entities.Korisnik;
+import mk.ukim.finki.busngo.model.entities.Patnik;
 import mk.ukim.finki.busngo.model.entities.Tipbilet;
 import mk.ukim.finki.busngo.model.enums.BILET_STATUS;
+import mk.ukim.finki.busngo.model.exceptions.InvalidBiletIdException;
 import mk.ukim.finki.busngo.model.exceptions.InvalidTipBiletIdException;
 import mk.ukim.finki.busngo.repository.BiletRepository;
+import mk.ukim.finki.busngo.repository.KorisnikRepository;
 import mk.ukim.finki.busngo.repository.TipBIletRepository;
 import mk.ukim.finki.busngo.service.BiletService;
 import mk.ukim.finki.busngo.service.KorisnikService;
 import mk.ukim.finki.busngo.service.PatnikService;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
@@ -24 +28 @@
     private final TipBIletRepository tipBIletRepository;
     private final PatnikService patnikService;
+    private final PasswordEncoder passwordEncoder;
+    private final KorisnikRepository korisnikRepository;
 
-    public BiletServiceImpl(BiletRepository biletRepository, KorisnikService korisnikService, TipBIletRepository tipBIletRepository, PatnikService patnikService) {
+    public BiletServiceImpl(BiletRepository biletRepository, KorisnikService korisnikService, TipBIletRepository tipBIletRepository, PatnikService patnikService, PasswordEncoder passwordEncoder, KorisnikRepository korisnikRepository) {
         this.biletRepository = biletRepository;
         this.korisnikService = korisnikService;
         this.tipBIletRepository = tipBIletRepository;
         this.patnikService = patnikService;
+        this.passwordEncoder = passwordEncoder;
+        this.korisnikRepository = korisnikRepository;
     }
 
@@ -39 +47 @@
     @Override
     public List<Bilet> findAllByPatnikId(Long id) {
-        Korisnik korisnik = korisnikService.findById(id);
-        return new ArrayList<>();
+        Patnik patnik = patnikService.findById(id);
+        return patnik.getBiletsByKId();
     }
 
@@ -52 +60 @@
     public Bilet buy(Long tipbilet, LocalDateTime now, BILET_STATUS biletStatus, String name) {
         Tipbilet tipbilet1 = tipBIletRepository.findById(tipbilet).orElseThrow(InvalidTipBiletIdException::new);
-        Korisnik korisnik = korisnikService.loadUserByEmail(name);
+        Patnik korisnik = patnikService.loadUserByEmail(name);
         Bilet bilet = new Bilet();
         bilet.setBStatus(biletStatus);
@@ -60 +68 @@
         return biletRepository.save(bilet);
     }
+
+    @Override
+    public List<Bilet> findAllByPatnikEmail(String email) {
+        Patnik patnik = patnikService.loadUserByEmail(email);
+        return patnik.getBiletsByKId();
+    }
+
+    @Override
+    public Bilet findBybIdAndPatnikEmail(Long bId, String email) {
+        Patnik patnik = patnikService.loadUserByEmail(email);
+        return biletRepository.findByBIdAndAndKorisnikByPatnikKId(bId, patnik).orElseThrow(InvalidBiletIdException::new);
+    }
+
+    @Override
+    public Bilet activate(Long bId) {
+        Bilet bilet = this.findById(bId);
+        bilet.setBStatus(BILET_STATUS.ACTIVE);
+        return biletRepository.save(bilet);
+    }
+
+    @Override
+    public Bilet findById(Long bId) {
+        return biletRepository.findById(bId).orElseThrow(RuntimeException::new);
+    }
+
+    @Override
+    public Bilet finish(Long bId) {
+        Bilet bilet = this.findById(bId);
+        bilet.setBStatus(BILET_STATUS.EXPIRED);
+        return biletRepository.save(bilet);
+    }
+
+    @Override
+    public boolean checkExpiration(Long bId) {
+        Bilet bilet = this.findById(bId);
+        LocalDateTime timeBought = bilet.getBDatumNaKupuvanje().toLocalDateTime();
+
+        if(timeBought.plusSeconds(bilet.getTipbiletByTbId().getTbTrajnost()).isBefore(LocalDateTime.now())){
+            bilet.setBStatus(BILET_STATUS.EXPIRED);
+            biletRepository.save(bilet);
+            return true;
+        }
+
+        return false;
+    }
+
+//    @Override
+//    public void encode(){
+//        List<Korisnik> all = korisnikRepository.findAll();
+//        all.forEach(p -> p.setKLozinka(passwordEncoder.encode(p.getKLozinka())));
+//        korisnikRepository.saveAll(all);
+//        System.out.println("DONE!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+//    }
+
+
 }

src/main/java/mk/ukim/finki/busngo/service/impl/PatnikServiceImpl.java

@@ -1 +1 @@
 package mk.ukim.finki.busngo.service.impl;
 
+import mk.ukim.finki.busngo.model.entities.Instancanalinija;
+import mk.ukim.finki.busngo.model.entities.Korisnik;
 import mk.ukim.finki.busngo.model.entities.Patnik;
 import mk.ukim.finki.busngo.model.exceptions.InvalidPatnikIdException;
 import mk.ukim.finki.busngo.repository.PatnikRepository;
+import mk.ukim.finki.busngo.service.InstancaNaLinijaService;
 import mk.ukim.finki.busngo.service.PatnikService;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 
@@ -12 +16 @@
 public class PatnikServiceImpl implements PatnikService {
     private final PatnikRepository patnikRepository;
+    private final InstancaNaLinijaService instancaNaLinijaService;
 
-    public PatnikServiceImpl(PatnikRepository patnikRepository) {
+    public PatnikServiceImpl(PatnikRepository patnikRepository, InstancaNaLinijaService instancaNaLinijaService) {
         this.patnikRepository = patnikRepository;
+        this.instancaNaLinijaService = instancaNaLinijaService;
     }
 
     @Override
     public List<Patnik> listAll() {
-        return patnikRepository.findAll();
+        return  patnikRepository.findAll();
     }
 
@@ -26 +32 @@
         return patnikRepository.findById(id).orElseThrow(InvalidPatnikIdException::new);
     }
+
+    @Override
+    public Patnik loadUserByEmail(String email) {
+        return patnikRepository.findByKEmail(email).orElseThrow(InvalidPatnikIdException::new);
+    }
+
+    @Override
+    public Patnik save(Korisnik korisnik) {
+        Patnik patnik = new Patnik();
+        patnik.setKId(korisnik.getKId());
+        patnik.setKEmail(korisnik.getKEmail());
+        patnik.setKAdresa(korisnik.getKAdresa());
+        patnik.setKIme(korisnik.getKIme());
+        patnik.setKTelefon(korisnik.getKTelefon());
+        patnik.setKIsAdmin(korisnik.getKIsAdmin());
+        patnik.setKLozinka(korisnik.getKLozinka());
+
+        return patnikRepository.save((Patnik) korisnik);
+    }
+
+
 }