Index: src/main/java/mk/ukim/finki/busngo/BusNGoApplication.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/BusNGoApplication.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ src/main/java/mk/ukim/finki/busngo/BusNGoApplication.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
@@ -3,7 +3,4 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
 
 @SpringBootApplication
@@ -11,11 +8,5 @@
 
     public static void main(String[] args) {
-
-
         SpringApplication.run(BusNGoApplication.class, args);
-    }
-    @Bean
-    PasswordEncoder passwordEncoder(){
-        return new BCryptPasswordEncoder(10);
     }
 
Index: src/main/java/mk/ukim/finki/busngo/config/CustomUsernamePasswordAuthenticationProvider.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/config/CustomUsernamePasswordAuthenticationProvider.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,46 +1,0 @@
-package mk.ukim.finki.busngo.config;
-
-import mk.ukim.finki.busngo.service.KorisnikService;
-import org.springframework.security.authentication.AuthenticationProvider;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Component;
-
-@Component
-public class CustomUsernamePasswordAuthenticationProvider implements AuthenticationProvider {
-
-    private final KorisnikService userService;
-    private final PasswordEncoder passwordEncoder;
-
-    public CustomUsernamePasswordAuthenticationProvider(KorisnikService userService, PasswordEncoder passwordEncoder) {
-        this.userService = userService;
-        this.passwordEncoder = passwordEncoder;
-    }
-
-    @Override
-    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-        String username = authentication.getName();
-        String password = authentication.getCredentials().toString();
-
-        if (username.isEmpty() || password.isEmpty()) {
-            throw new BadCredentialsException("Empty credentials!");
-        }
-
-        UserDetails userDetails = this.userService.loadUserByEmail(username);
-
-        if (!passwordEncoder.matches(password, userDetails.getPassword())) {
-            throw new BadCredentialsException("Password is incorrect!");
-        }
-        return new UsernamePasswordAuthenticationToken(userDetails, userDetails.getPassword(), userDetails.getAuthorities());
-    }
-
-    @Override
-    public boolean supports(Class<?> aClass) {
-        return aClass.equals(UsernamePasswordAuthenticationToken.class);
-    }
-
-}
Index: src/main/java/mk/ukim/finki/busngo/config/WebSecurityConfig.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/config/WebSecurityConfig.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,73 +1,0 @@
-package mk.ukim.finki.busngo.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
-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.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.provisioning.InMemoryUserDetailsManager;
-import org.springframework.security.web.SecurityFilterChain;
-
-
-@Configuration
-@EnableWebSecurity
-@EnableMethodSecurity
-public class WebSecurityConfig {
-
-    private final PasswordEncoder passwordEncoder;
-    private final CustomUsernamePasswordAuthenticationProvider authProvider;
-
-    public WebSecurityConfig(PasswordEncoder passwordEncoder, CustomUsernamePasswordAuthenticationProvider authProvider) {
-        this.passwordEncoder = passwordEncoder;
-        this.authProvider = authProvider;
-    }
-
-    @Bean
-    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception  {
-
-        http
-                .csrf(AbstractHttpConfigurer::disable)
-                .authorizeHttpRequests( (requests) -> requests
-                        .requestMatchers("/", "/home", "/assets/**", "/register")
-                        .permitAll()
-                        .requestMatchers("/admin/**").hasRole("ADMIN")
-                        .anyRequest()
-                        .authenticated()
-                )
-                .formLogin((form) -> form
-                        .loginPage("/login")
-                        .permitAll()
-                        .failureUrl("/login?error=BadCredentials")
-                        .defaultSuccessUrl("/bilet", true)
-                )
-                .logout((logout) -> logout
-                        .logoutUrl("/logout")
-                        .clearAuthentication(true)
-                        .invalidateHttpSession(true)
-                        .deleteCookies("JSESSIONID")
-                        .logoutSuccessUrl("/login")
-                )
-                .exceptionHandling((ex) -> ex
-                        .accessDeniedPage("/access_denied")
-                );
-
-        return http.build();
-    }
-
-
-
-    @Bean
-    public AuthenticationManager authManager(HttpSecurity http) throws Exception {
-        AuthenticationManagerBuilder authenticationManagerBuilder =
-                http.getSharedObject(AuthenticationManagerBuilder.class);
-        authenticationManagerBuilder.authenticationProvider(authProvider);
-        return authenticationManagerBuilder.build();
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/model/Avtobus.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/Avtobus.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
+++ src/main/java/mk/ukim/finki/busngo/model/Avtobus.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
@@ -0,0 +1,67 @@
+package mk.ukim.finki.busngo.model;
+
+import jakarta.persistence.*;
+
+import java.util.Collection;
+import java.util.Objects;
+
+@Entity
+public class Avtobus {
+    private String aRegistracija;
+    private String aSeriskiBroj;
+    private Short aBrojSedista;
+    private Collection<Instancanalinija> instancanalinijasByARegistracija;
+
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Id
+    @Column(name = "a_registracija", nullable = false, length = 8)
+    public String getaRegistracija() {
+        return aRegistracija;
+    }
+
+    public void setaRegistracija(String aRegistracija) {
+        this.aRegistracija = aRegistracija;
+    }
+
+    @Basic
+    @Column(name = "a_seriski_broj", nullable = false)
+    public String getaSeriskiBroj() {
+        return aSeriskiBroj;
+    }
+
+    public void setaSeriskiBroj(String aSeriskiBroj) {
+        this.aSeriskiBroj = aSeriskiBroj;
+    }
+
+    @Basic
+    @Column(name = "a_broj_sedista", nullable = true)
+    public Short getaBrojSedista() {
+        return aBrojSedista;
+    }
+
+    public void setaBrojSedista(Short aBrojSedista) {
+        this.aBrojSedista = aBrojSedista;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Avtobus avtobus = (Avtobus) o;
+        return Objects.equals(aRegistracija, avtobus.aRegistracija) && Objects.equals(aSeriskiBroj, avtobus.aSeriskiBroj) && Objects.equals(aBrojSedista, avtobus.aBrojSedista);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(aRegistracija, aSeriskiBroj, aBrojSedista);
+    }
+
+    @OneToMany(mappedBy = "avtobusByARegistracija")
+    public Collection<Instancanalinija> getInstancanalinijasByARegistracija() {
+        return instancanalinijasByARegistracija;
+    }
+
+    public void setInstancanalinijasByARegistracija(Collection<Instancanalinija> instancanalinijasByARegistracija) {
+        this.instancanalinijasByARegistracija = instancanalinijasByARegistracija;
+    }
+}
Index: src/main/java/mk/ukim/finki/busngo/model/Bilet.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/Bilet.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
+++ src/main/java/mk/ukim/finki/busngo/model/Bilet.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
@@ -0,0 +1,114 @@
+package mk.ukim.finki.busngo.model;
+
+import jakarta.persistence.*;
+import mk.ukim.finki.busngo.model.enums.BILET_STATUS;
+
+import java.sql.Timestamp;
+import java.util.Collection;
+import java.util.Objects;
+
+@Entity
+public class Bilet {
+    private Long bId;
+    private Timestamp bDatumNaKupuvanje;
+    private BILET_STATUS bStatus;
+    private Long patnikKId;
+    private Long tbId;
+    private Korisnik korisnikByPatnikKId;
+    private Tipbilet tipbiletByTbId;
+    private Collection<Vozenje> vozenjesByBId;
+
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Id
+    @Column(name = "b_id", nullable = false)
+    public Long getbId() {
+        return bId;
+    }
+
+    public void setbId(Long bId) {
+        this.bId = bId;
+    }
+
+    @Basic
+    @Column(name = "b_datum_na_kupuvanje", nullable = false)
+    public Timestamp getbDatumNaKupuvanje() {
+        return bDatumNaKupuvanje;
+    }
+
+    public void setbDatumNaKupuvanje(Timestamp bDatumNaKupuvanje) {
+        this.bDatumNaKupuvanje = bDatumNaKupuvanje;
+    }
+
+    @Basic
+    @Column(name = "b_status", nullable = false)
+    @Enumerated(EnumType.STRING)
+    public BILET_STATUS getbStatus() {
+        return bStatus;
+    }
+
+    public void setbStatus(BILET_STATUS bStatus) {
+        this.bStatus = bStatus;
+    }
+
+    @Basic
+    @Column(name = "patnik_k_id", nullable = true)
+    public Long getPatnikKId() {
+        return patnikKId;
+    }
+
+    public void setPatnikKId(Long patnikKId) {
+        this.patnikKId = patnikKId;
+    }
+
+    @Basic
+    @Column(name = "tb_id", nullable = true)
+    public Long getTbId() {
+        return tbId;
+    }
+
+    public void setTbId(Long tbId) {
+        this.tbId = tbId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Bilet bilet = (Bilet) o;
+        return Objects.equals(bId, bilet.bId) && Objects.equals(bDatumNaKupuvanje, bilet.bDatumNaKupuvanje) && Objects.equals(bStatus, bilet.bStatus) && Objects.equals(patnikKId, bilet.patnikKId) && Objects.equals(tbId, bilet.tbId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(bId, bDatumNaKupuvanje, bStatus, patnikKId, tbId);
+    }
+
+    @ManyToOne
+    @JoinColumn(name = "patnik_k_id", referencedColumnName = "k_id")
+    public Korisnik getKorisnikByPatnikKId() {
+        return korisnikByPatnikKId;
+    }
+
+    public void setKorisnikByPatnikKId(Korisnik korisnikByPatnikKId) {
+        this.korisnikByPatnikKId = korisnikByPatnikKId;
+    }
+
+    @ManyToOne
+    @JoinColumn(name = "tb_id", referencedColumnName = "tb_id")
+    public Tipbilet getTipbiletByTbId() {
+        return tipbiletByTbId;
+    }
+
+    public void setTipbiletByTbId(Tipbilet tipbiletByTbId) {
+        this.tipbiletByTbId = tipbiletByTbId;
+    }
+
+    @OneToMany(mappedBy = "biletByBId")
+    public Collection<Vozenje> getVozenjesByBId() {
+        return vozenjesByBId;
+    }
+
+    public void setVozenjesByBId(Collection<Vozenje> vozenjesByBId) {
+        this.vozenjesByBId = vozenjesByBId;
+    }
+}
Index: src/main/java/mk/ukim/finki/busngo/model/Instancanalinija.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/Instancanalinija.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
+++ src/main/java/mk/ukim/finki/busngo/model/Instancanalinija.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
@@ -0,0 +1,144 @@
+package mk.ukim.finki.busngo.model;
+
+import jakarta.persistence.*;
+
+import java.sql.Timestamp;
+import java.util.Collection;
+import java.util.Objects;
+
+@Entity
+public class Instancanalinija {
+    private Long inlId;
+    private Timestamp inlDatumStart;
+    private Timestamp inlDatumEnd;
+    private Long vozacKId;
+    private String aRegistracija;
+    private Integer liId;
+    private Korisnik korisnikByVozacKId;
+    private Avtobus avtobusByARegistracija;
+    private Linija linijaByLiId;
+    private Collection<Vozenje> vozenjesByInlId;
+    private Collection<Kontroli> kontrolisByInlId;
+
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Id
+    @Column(name = "inl_id", nullable = false)
+    public Long getInlId() {
+        return inlId;
+    }
+
+    public void setInlId(Long inlId) {
+        this.inlId = inlId;
+    }
+
+    @Basic
+    @Column(name = "inl_datum_start", nullable = false)
+    public Timestamp getInlDatumStart() {
+        return inlDatumStart;
+    }
+
+    public void setInlDatumStart(Timestamp inlDatumStart) {
+        this.inlDatumStart = inlDatumStart;
+    }
+
+    @Basic
+    @Column(name = "inl_datum_end", nullable = true)
+    public Timestamp getInlDatumEnd() {
+        return inlDatumEnd;
+    }
+
+    public void setInlDatumEnd(Timestamp inlDatumEnd) {
+        this.inlDatumEnd = inlDatumEnd;
+    }
+
+    @Basic
+    @Column(name = "vozac_k_id", nullable = false)
+    public Long getVozacKId() {
+        return vozacKId;
+    }
+
+    public void setVozacKId(Long vozacKId) {
+        this.vozacKId = vozacKId;
+    }
+
+    @Basic
+    @Column(name = "a_registracija", nullable = true, length = 8)
+    public String getaRegistracija() {
+        return aRegistracija;
+    }
+
+    public void setaRegistracija(String aRegistracija) {
+        this.aRegistracija = aRegistracija;
+    }
+
+    @Basic
+    @Column(name = "li_id", nullable = false)
+    public Integer getLiId() {
+        return liId;
+    }
+
+    public void setLiId(Integer liId) {
+        this.liId = liId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Instancanalinija that = (Instancanalinija) o;
+        return Objects.equals(inlId, that.inlId) && Objects.equals(inlDatumStart, that.inlDatumStart) && Objects.equals(inlDatumEnd, that.inlDatumEnd) && Objects.equals(vozacKId, that.vozacKId) && Objects.equals(aRegistracija, that.aRegistracija) && Objects.equals(liId, that.liId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(inlId, inlDatumStart, inlDatumEnd, vozacKId, aRegistracija, liId);
+    }
+
+    @ManyToOne
+    @JoinColumn(name = "vozac_k_id", referencedColumnName = "k_id", nullable = false)
+    public Korisnik getKorisnikByVozacKId() {
+        return korisnikByVozacKId;
+    }
+
+    public void setKorisnikByVozacKId(Korisnik korisnikByVozacKId) {
+        this.korisnikByVozacKId = korisnikByVozacKId;
+    }
+
+    @ManyToOne
+    @JoinColumn(name = "a_registracija", referencedColumnName = "a_registracija")
+    public Avtobus getAvtobusByARegistracija() {
+        return avtobusByARegistracija;
+    }
+
+    public void setAvtobusByARegistracija(Avtobus avtobusByARegistracija) {
+        this.avtobusByARegistracija = avtobusByARegistracija;
+    }
+
+    @ManyToOne
+    @JoinColumn(name = "li_id", referencedColumnName = "li_id", nullable = false)
+    public Linija getLinijaByLiId() {
+        return linijaByLiId;
+    }
+
+    public void setLinijaByLiId(Linija linijaByLiId) {
+        this.linijaByLiId = linijaByLiId;
+    }
+
+    @OneToMany(mappedBy = "instancanalinijaByInlId")
+    public Collection<Vozenje> getVozenjesByInlId() {
+        return vozenjesByInlId;
+    }
+
+    public void setVozenjesByInlId(Collection<Vozenje> vozenjesByInlId) {
+        this.vozenjesByInlId = vozenjesByInlId;
+    }
+
+    @OneToMany(mappedBy = "instancanalinijaByInlId")
+    public Collection<Kontroli> getKontrolisByInlId() {
+        return kontrolisByInlId;
+    }
+
+    public void setKontrolisByInlId(Collection<Kontroli> kontrolisByInlId) {
+        this.kontrolisByInlId = kontrolisByInlId;
+    }
+}
Index: src/main/java/mk/ukim/finki/busngo/model/Kazna.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/Kazna.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
+++ src/main/java/mk/ukim/finki/busngo/model/Kazna.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
@@ -0,0 +1,154 @@
+package mk.ukim.finki.busngo.model;
+
+import jakarta.persistence.*;
+
+import java.sql.Timestamp;
+import java.util.Objects;
+
+@Entity
+public class Kazna {
+    private Long kzId;
+    private Double kzIznos;
+    private Boolean kzPlateno;
+    private Timestamp kzDatum;
+    private Timestamp kzDatumPlateno;
+    private String kzDokument;
+    private Long kondukterKId;
+    private Long kontrolaId;
+    private Korisnik korisnikByKondukterKId;
+    private Kontroli kontroliByKontrolaId;
+    private Kaznazaneregistriran kaznazaneregistriranByKzId;
+    private Kaznazaregistriran kaznazaregistriranByKzId;
+
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Id
+    @Column(name = "kz_id", nullable = false)
+    public Long getKzId() {
+        return kzId;
+    }
+
+    public void setKzId(Long kzId) {
+        this.kzId = kzId;
+    }
+
+    @Basic
+    @Column(name = "kz_iznos", nullable = false, precision = 0)
+    public Double getKzIznos() {
+        return kzIznos;
+    }
+
+    public void setKzIznos(Double kzIznos) {
+        this.kzIznos = kzIznos;
+    }
+
+    @Basic
+    @Column(name = "kz_plateno", nullable = false)
+    public Boolean getKzPlateno() {
+        return kzPlateno;
+    }
+
+    public void setKzPlateno(Boolean kzPlateno) {
+        this.kzPlateno = kzPlateno;
+    }
+
+    @Basic
+    @Column(name = "kz_datum", nullable = false)
+    public Timestamp getKzDatum() {
+        return kzDatum;
+    }
+
+    public void setKzDatum(Timestamp kzDatum) {
+        this.kzDatum = kzDatum;
+    }
+
+    @Basic
+    @Column(name = "kz_datum_plateno", nullable = true)
+    public Timestamp getKzDatumPlateno() {
+        return kzDatumPlateno;
+    }
+
+    public void setKzDatumPlateno(Timestamp kzDatumPlateno) {
+        this.kzDatumPlateno = kzDatumPlateno;
+    }
+
+    @Basic
+    @Column(name = "kz_dokument", nullable = false)
+    public String getKzDokument() {
+        return kzDokument;
+    }
+
+    public void setKzDokument(String kzDokument) {
+        this.kzDokument = kzDokument;
+    }
+
+    @Basic
+    @Column(name = "kondukter_k_id", nullable = true)
+    public Long getKondukterKId() {
+        return kondukterKId;
+    }
+
+    public void setKondukterKId(Long kondukterKId) {
+        this.kondukterKId = kondukterKId;
+    }
+
+    @Basic
+    @Column(name = "kontrola_id", nullable = true)
+    public Long getKontrolaId() {
+        return kontrolaId;
+    }
+
+    public void setKontrolaId(Long kontrolaId) {
+        this.kontrolaId = kontrolaId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Kazna kazna = (Kazna) o;
+        return Objects.equals(kzId, kazna.kzId) && Objects.equals(kzIznos, kazna.kzIznos) && Objects.equals(kzPlateno, kazna.kzPlateno) && Objects.equals(kzDatum, kazna.kzDatum) && Objects.equals(kzDatumPlateno, kazna.kzDatumPlateno) && Objects.equals(kzDokument, kazna.kzDokument) && Objects.equals(kondukterKId, kazna.kondukterKId) && Objects.equals(kontrolaId, kazna.kontrolaId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(kzId, kzIznos, kzPlateno, kzDatum, kzDatumPlateno, kzDokument, kondukterKId, kontrolaId);
+    }
+
+    @ManyToOne
+    @JoinColumn(name = "kondukter_k_id", referencedColumnName = "k_id")
+    public Korisnik getKorisnikByKondukterKId() {
+        return korisnikByKondukterKId;
+    }
+
+    public void setKorisnikByKondukterKId(Korisnik korisnikByKondukterKId) {
+        this.korisnikByKondukterKId = korisnikByKondukterKId;
+    }
+
+    @ManyToOne
+    @JoinColumn(name = "kontrola_id", referencedColumnName = "kontrola_id")
+    public Kontroli getKontroliByKontrolaId() {
+        return kontroliByKontrolaId;
+    }
+
+    public void setKontroliByKontrolaId(Kontroli kontroliByKontrolaId) {
+        this.kontroliByKontrolaId = kontroliByKontrolaId;
+    }
+
+    @OneToOne(mappedBy = "kaznaByKzId")
+    public Kaznazaneregistriran getKaznazaneregistriranByKzId() {
+        return kaznazaneregistriranByKzId;
+    }
+
+    public void setKaznazaneregistriranByKzId(Kaznazaneregistriran kaznazaneregistriranByKzId) {
+        this.kaznazaneregistriranByKzId = kaznazaneregistriranByKzId;
+    }
+
+    @OneToOne(mappedBy = "kaznaByKzId")
+    public Kaznazaregistriran getKaznazaregistriranByKzId() {
+        return kaznazaregistriranByKzId;
+    }
+
+    public void setKaznazaregistriranByKzId(Kaznazaregistriran kaznazaregistriranByKzId) {
+        this.kaznazaregistriranByKzId = kaznazaregistriranByKzId;
+    }
+}
Index: src/main/java/mk/ukim/finki/busngo/model/Kaznazaneregistriran.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/Kaznazaneregistriran.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
+++ src/main/java/mk/ukim/finki/busngo/model/Kaznazaneregistriran.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
@@ -0,0 +1,78 @@
+package mk.ukim.finki.busngo.model;
+
+import jakarta.persistence.*;
+
+import java.util.Objects;
+
+@Entity
+public class Kaznazaneregistriran {
+    private Long kzId;
+    private Object kznTelefon;
+    private Object kznIme;
+    private Object kznAdresa;
+    private Kazna kaznaByKzId;
+
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Id
+    @Column(name = "kz_id", nullable = false)
+    public Long getKzId() {
+        return kzId;
+    }
+
+    public void setKzId(Long kzId) {
+        this.kzId = kzId;
+    }
+
+    @Basic
+    @Column(name = "kzn_telefon", nullable = true)
+    public Object getKznTelefon() {
+        return kznTelefon;
+    }
+
+    public void setKznTelefon(Object kznTelefon) {
+        this.kznTelefon = kznTelefon;
+    }
+
+    @Basic
+    @Column(name = "kzn_ime", nullable = false)
+    public Object getKznIme() {
+        return kznIme;
+    }
+
+    public void setKznIme(Object kznIme) {
+        this.kznIme = kznIme;
+    }
+
+    @Basic
+    @Column(name = "kzn_adresa", nullable = false)
+    public Object getKznAdresa() {
+        return kznAdresa;
+    }
+
+    public void setKznAdresa(Object kznAdresa) {
+        this.kznAdresa = kznAdresa;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Kaznazaneregistriran that = (Kaznazaneregistriran) o;
+        return Objects.equals(kzId, that.kzId) && Objects.equals(kznTelefon, that.kznTelefon) && Objects.equals(kznIme, that.kznIme) && Objects.equals(kznAdresa, that.kznAdresa);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(kzId, kznTelefon, kznIme, kznAdresa);
+    }
+
+    @OneToOne
+    @JoinColumn(name = "kz_id", referencedColumnName = "kz_id", nullable = false)
+    public Kazna getKaznaByKzId() {
+        return kaznaByKzId;
+    }
+
+    public void setKaznaByKzId(Kazna kaznaByKzId) {
+        this.kaznaByKzId = kaznaByKzId;
+    }
+}
Index: src/main/java/mk/ukim/finki/busngo/model/Kaznazaregistriran.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/Kaznazaregistriran.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
+++ src/main/java/mk/ukim/finki/busngo/model/Kaznazaregistriran.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
@@ -0,0 +1,67 @@
+package mk.ukim.finki.busngo.model;
+
+import jakarta.persistence.*;
+
+import java.util.Objects;
+
+@Entity
+public class Kaznazaregistriran {
+    private Long kzId;
+    private Long patnikKId;
+    private Kazna kaznaByKzId;
+    private Korisnik korisnikByPatnikKId;
+
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Id
+    @Column(name = "kz_id", nullable = false)
+    public Long getKzId() {
+        return kzId;
+    }
+
+    public void setKzId(Long kzId) {
+        this.kzId = kzId;
+    }
+
+    @Basic
+    @Column(name = "patnik_k_id", nullable = true)
+    public Long getPatnikKId() {
+        return patnikKId;
+    }
+
+    public void setPatnikKId(Long patnikKId) {
+        this.patnikKId = patnikKId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Kaznazaregistriran that = (Kaznazaregistriran) o;
+        return Objects.equals(kzId, that.kzId) && Objects.equals(patnikKId, that.patnikKId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(kzId, patnikKId);
+    }
+
+    @OneToOne
+    @JoinColumn(name = "kz_id", referencedColumnName = "kz_id", nullable = false)
+    public Kazna getKaznaByKzId() {
+        return kaznaByKzId;
+    }
+
+    public void setKaznaByKzId(Kazna kaznaByKzId) {
+        this.kaznaByKzId = kaznaByKzId;
+    }
+
+    @ManyToOne
+    @JoinColumn(name = "patnik_k_id", referencedColumnName = "k_id")
+    public Korisnik getKorisnikByPatnikKId() {
+        return korisnikByPatnikKId;
+    }
+
+    public void setKorisnikByPatnikKId(Korisnik korisnikByPatnikKId) {
+        this.korisnikByPatnikKId = korisnikByPatnikKId;
+    }
+}
Index: src/main/java/mk/ukim/finki/busngo/model/Kondukter.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/Kondukter.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
+++ src/main/java/mk/ukim/finki/busngo/model/Kondukter.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
@@ -0,0 +1,45 @@
+package mk.ukim.finki.busngo.model;
+
+import jakarta.persistence.*;
+
+import java.util.Objects;
+
+@Entity
+public class Kondukter {
+    private Long kId;
+    private Korisnik korisnikByKId;
+
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Id
+    @Column(name = "k_id", nullable = false)
+    public Long getkId() {
+        return kId;
+    }
+
+    public void setkId(Long kId) {
+        this.kId = kId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Kondukter kondukter = (Kondukter) o;
+        return Objects.equals(kId, kondukter.kId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(kId);
+    }
+
+    @OneToOne
+    @JoinColumn(name = "k_id", referencedColumnName = "k_id", nullable = false)
+    public Korisnik getKorisnikByKId() {
+        return korisnikByKId;
+    }
+
+    public void setKorisnikByKId(Korisnik korisnikByKId) {
+        this.korisnikByKId = korisnikByKId;
+    }
+}
Index: src/main/java/mk/ukim/finki/busngo/model/Kontroli.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/Kontroli.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
+++ src/main/java/mk/ukim/finki/busngo/model/Kontroli.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
@@ -0,0 +1,101 @@
+package mk.ukim.finki.busngo.model;
+
+import jakarta.persistence.*;
+
+import java.sql.Timestamp;
+import java.util.Collection;
+import java.util.Objects;
+
+@Entity
+public class Kontroli {
+    private Long kontrolaId;
+    private Timestamp kontrolaDatum;
+    private Long kondukterKId;
+    private Long inlId;
+    private Korisnik korisnikByKondukterKId;
+    private Instancanalinija instancanalinijaByInlId;
+    private Collection<Kazna> kaznasByKontrolaId;
+
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Id
+    @Column(name = "kontrola_id", nullable = false)
+    public Long getKontrolaId() {
+        return kontrolaId;
+    }
+
+    public void setKontrolaId(Long kontrolaId) {
+        this.kontrolaId = kontrolaId;
+    }
+
+    @Basic
+    @Column(name = "kontrola_datum", nullable = false)
+    public Timestamp getKontrolaDatum() {
+        return kontrolaDatum;
+    }
+
+    public void setKontrolaDatum(Timestamp kontrolaDatum) {
+        this.kontrolaDatum = kontrolaDatum;
+    }
+
+    @Basic
+    @Column(name = "kondukter_k_id", nullable = true)
+    public Long getKondukterKId() {
+        return kondukterKId;
+    }
+
+    public void setKondukterKId(Long kondukterKId) {
+        this.kondukterKId = kondukterKId;
+    }
+
+    @Basic
+    @Column(name = "inl_id", nullable = true)
+    public Long getInlId() {
+        return inlId;
+    }
+
+    public void setInlId(Long inlId) {
+        this.inlId = inlId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Kontroli kontroli = (Kontroli) o;
+        return Objects.equals(kontrolaId, kontroli.kontrolaId) && Objects.equals(kontrolaDatum, kontroli.kontrolaDatum) && Objects.equals(kondukterKId, kontroli.kondukterKId) && Objects.equals(inlId, kontroli.inlId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(kontrolaId, kontrolaDatum, kondukterKId, inlId);
+    }
+
+    @ManyToOne
+    @JoinColumn(name = "kondukter_k_id", referencedColumnName = "k_id")
+    public Korisnik getKorisnikByKondukterKId() {
+        return korisnikByKondukterKId;
+    }
+
+    public void setKorisnikByKondukterKId(Korisnik korisnikByKondukterKId) {
+        this.korisnikByKondukterKId = korisnikByKondukterKId;
+    }
+
+    @ManyToOne
+    @JoinColumn(name = "inl_id", referencedColumnName = "inl_id")
+    public Instancanalinija getInstancanalinijaByInlId() {
+        return instancanalinijaByInlId;
+    }
+
+    public void setInstancanalinijaByInlId(Instancanalinija instancanalinijaByInlId) {
+        this.instancanalinijaByInlId = instancanalinijaByInlId;
+    }
+
+    @OneToMany(mappedBy = "kontroliByKontrolaId")
+    public Collection<Kazna> getKaznasByKontrolaId() {
+        return kaznasByKontrolaId;
+    }
+
+    public void setKaznasByKontrolaId(Collection<Kazna> kaznasByKontrolaId) {
+        this.kaznasByKontrolaId = kaznasByKontrolaId;
+    }
+}
Index: src/main/java/mk/ukim/finki/busngo/model/Korisnik.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/Korisnik.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
+++ src/main/java/mk/ukim/finki/busngo/model/Korisnik.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
@@ -0,0 +1,202 @@
+package mk.ukim.finki.busngo.model;
+
+import jakarta.persistence.*;
+
+import java.util.Collection;
+import java.util.Objects;
+
+@Entity
+public class Korisnik {
+    private Long kId;
+    private String kIme;
+    private String kAdresa;
+    private String kTelefon;
+    private String kEmail;
+    private String kEmbg;
+    private Boolean kIsAdmin;
+    private String kLozinka;
+    private Patnik patnikByKId;
+    private Vraboten vrabotenByKId;
+    private Kondukter kondukterByKId;
+    private Vozac vozacByKId;
+    private Collection<Bilet> biletsByKId;
+    private Collection<Vozenje> vozenjesByKId;
+    private Collection<Kontroli> kontrolisByKId;
+    private Collection<Kazna> kaznasByKId;
+    private Collection<Kaznazaregistriran> kaznazaregistriransByKId;
+
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Id
+    @Column(name = "k_id", nullable = false)
+    public Long getkId() {
+        return kId;
+    }
+
+    public void setkId(Long kId) {
+        this.kId = kId;
+    }
+
+    @Basic
+    @Column(name = "k_ime", nullable = false)
+    public String getkIme() {
+        return kIme;
+    }
+
+    public void setkIme(String kIme) {
+        this.kIme = kIme;
+    }
+
+    @Basic
+    @Column(name = "k_adresa", nullable = true)
+    public String getkAdresa() {
+        return kAdresa;
+    }
+
+    public void setkAdresa(String kAdresa) {
+        this.kAdresa = kAdresa;
+    }
+
+    @Basic
+    @Column(name = "k_telefon", nullable = false)
+    public String getkTelefon() {
+        return kTelefon;
+    }
+
+    public void setkTelefon(String kTelefon) {
+        this.kTelefon = kTelefon;
+    }
+
+    @Basic
+    @Column(name = "k_email", nullable = false)
+    public String getkEmail() {
+        return kEmail;
+    }
+
+    public void setkEmail(String kEmail) {
+        this.kEmail = kEmail;
+    }
+
+    @Basic
+    @Column(name = "k_embg", nullable = true, length = 13)
+    public String getkEmbg() {
+        return kEmbg;
+    }
+
+    public void setkEmbg(String kEmbg) {
+        this.kEmbg = kEmbg;
+    }
+
+    @Basic
+    @Column(name = "k_is_admin", nullable = false)
+    public Boolean getkIsAdmin() {
+        return kIsAdmin;
+    }
+
+    public void setkIsAdmin(Boolean kIsAdmin) {
+        this.kIsAdmin = kIsAdmin;
+    }
+
+    @Basic
+    @Column(name = "k_lozinka", nullable = false)
+    public String getkLozinka() {
+        return kLozinka;
+    }
+
+    public void setkLozinka(String kLozinka) {
+        this.kLozinka = kLozinka;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Korisnik korisnik = (Korisnik) o;
+        return Objects.equals(kId, korisnik.kId) && Objects.equals(kIme, korisnik.kIme) && Objects.equals(kAdresa, korisnik.kAdresa) && Objects.equals(kTelefon, korisnik.kTelefon) && Objects.equals(kEmail, korisnik.kEmail) && Objects.equals(kEmbg, korisnik.kEmbg) && Objects.equals(kIsAdmin, korisnik.kIsAdmin) && Objects.equals(kLozinka, korisnik.kLozinka);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(kId, kIme, kAdresa, kTelefon, kEmail, kEmbg, kIsAdmin, kLozinka);
+    }
+
+    @OneToOne(mappedBy = "korisnikByKId")
+    public Patnik getPatnikByKId() {
+        return patnikByKId;
+    }
+
+    public void setPatnikByKId(Patnik patnikByKId) {
+        this.patnikByKId = patnikByKId;
+    }
+
+    @OneToOne(mappedBy = "korisnikByKId")
+    public Vraboten getVrabotenByKId() {
+        return vrabotenByKId;
+    }
+
+    public void setVrabotenByKId(Vraboten vrabotenByKId) {
+        this.vrabotenByKId = vrabotenByKId;
+    }
+
+    @OneToOne(mappedBy = "korisnikByKId")
+    public Kondukter getKondukterByKId() {
+        return kondukterByKId;
+    }
+
+    public void setKondukterByKId(Kondukter kondukterByKId) {
+        this.kondukterByKId = kondukterByKId;
+    }
+
+    @OneToOne(mappedBy = "korisnikByKId")
+    public Vozac getVozacByKId() {
+        return vozacByKId;
+    }
+
+    public void setVozacByKId(Vozac vozacByKId) {
+        this.vozacByKId = vozacByKId;
+    }
+
+    @OneToMany(mappedBy = "korisnikByPatnikKId")
+    public Collection<Bilet> getBiletsByKId() {
+        return biletsByKId;
+    }
+
+    public void setBiletsByKId(Collection<Bilet> biletsByKId) {
+        this.biletsByKId = biletsByKId;
+    }
+
+    @OneToMany(mappedBy = "korisnikByPatnikKId")
+    public Collection<Vozenje> getVozenjesByKId() {
+        return vozenjesByKId;
+    }
+
+    public void setVozenjesByKId(Collection<Vozenje> vozenjesByKId) {
+        this.vozenjesByKId = vozenjesByKId;
+    }
+
+    @OneToMany(mappedBy = "korisnikByKondukterKId")
+    public Collection<Kontroli> getKontrolisByKId() {
+        return kontrolisByKId;
+    }
+
+    public void setKontrolisByKId(Collection<Kontroli> kontrolisByKId) {
+        this.kontrolisByKId = kontrolisByKId;
+    }
+
+    @OneToMany(mappedBy = "korisnikByKondukterKId")
+    public Collection<Kazna> getKaznasByKId() {
+        return kaznasByKId;
+    }
+
+    public void setKaznasByKId(Collection<Kazna> kaznasByKId) {
+        this.kaznasByKId = kaznasByKId;
+    }
+
+    @OneToMany(mappedBy = "korisnikByPatnikKId")
+    public Collection<Kaznazaregistriran> getKaznazaregistriransByKId() {
+        return kaznazaregistriransByKId;
+    }
+
+    public void setKaznazaregistriransByKId(Collection<Kaznazaregistriran> kaznazaregistriransByKId) {
+        this.kaznazaregistriransByKId = kaznazaregistriransByKId;
+    }
+}
Index: src/main/java/mk/ukim/finki/busngo/model/Linija.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/Linija.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
+++ src/main/java/mk/ukim/finki/busngo/model/Linija.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
@@ -0,0 +1,78 @@
+package mk.ukim.finki.busngo.model;
+
+import jakarta.persistence.*;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+
+@Entity
+public class Linija {
+    private Integer liId;
+    private String liIme;
+    private String liPravec;
+    private List<Postojkanalinija> postojkanalinijasByLiId;
+    private List<Instancanalinija> instancanalinijasByLiId;
+
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Id
+    @Column(name = "li_id", nullable = false)
+    public Integer getLiId() {
+        return liId;
+    }
+
+    public void setLiId(Integer liId) {
+        this.liId = liId;
+    }
+
+    @Basic
+    @Column(name = "li_ime", nullable = false)
+    public String getLiIme() {
+        return liIme;
+    }
+
+    public void setLiIme(String liIme) {
+        this.liIme = liIme;
+    }
+
+    @Basic
+    @Column(name = "li_pravec", nullable = false)
+    public String getLiPravec() {
+        return liPravec;
+    }
+
+    public void setLiPravec(String liPravec) {
+        this.liPravec = liPravec;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Linija linija = (Linija) o;
+        return Objects.equals(liId, linija.liId) && Objects.equals(liIme, linija.liIme) && Objects.equals(liPravec, linija.liPravec);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(liId, liIme, liPravec);
+    }
+
+    @OneToMany(mappedBy = "linijaByLiId")
+    public List<Postojkanalinija> getPostojkanalinijasByLiId() {
+        return postojkanalinijasByLiId;
+    }
+
+    public void setPostojkanalinijasByLiId(List<Postojkanalinija> postojkanalinijasByLiId) {
+        this.postojkanalinijasByLiId = postojkanalinijasByLiId;
+    }
+
+    @OneToMany(mappedBy = "linijaByLiId")
+    public List<Instancanalinija> getInstancanalinijasByLiId() {
+        return instancanalinijasByLiId;
+    }
+
+    public void setInstancanalinijasByLiId(List<Instancanalinija> instancanalinijasByLiId) {
+        this.instancanalinijasByLiId = instancanalinijasByLiId;
+    }
+}
Index: src/main/java/mk/ukim/finki/busngo/model/Mesto.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/Mesto.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
+++ src/main/java/mk/ukim/finki/busngo/model/Mesto.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
@@ -0,0 +1,79 @@
+package mk.ukim.finki.busngo.model;
+
+import jakarta.persistence.*;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+
+@Entity
+public class Mesto {
+    private Integer mId;
+    private String mGrad;
+    private String mOpstina;
+    private String mUlica;
+    private List<Postojka> postojkasByMId;
+
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Id
+    @Column(name = "m_id", nullable = false)
+    public Integer getmId() {
+        return mId;
+    }
+
+    public void setmId(Integer mId) {
+        this.mId = mId;
+    }
+
+    @Basic
+    @Column(name = "m_grad", nullable = false)
+    public String getmGrad() {
+        return mGrad;
+    }
+
+    public void setmGrad(String mGrad) {
+        this.mGrad = mGrad;
+    }
+
+    @Basic
+    @Column(name = "m_opstina", nullable = false)
+    public String getmOpstina() {
+        return mOpstina;
+    }
+
+    public void setmOpstina(String mOpstina) {
+        this.mOpstina = mOpstina;
+    }
+
+    @Basic
+    @Column(name = "m_ulica", nullable = false)
+    public String getmUlica() {
+        return mUlica;
+    }
+
+    public void setmUlica(String mUlica) {
+        this.mUlica = mUlica;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Mesto mesto = (Mesto) o;
+        return Objects.equals(mId, mesto.mId) && Objects.equals(mGrad, mesto.mGrad) && Objects.equals(mOpstina, mesto.mOpstina) && Objects.equals(mUlica, mesto.mUlica);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(mId, mGrad, mOpstina, mUlica);
+    }
+
+    @OneToMany(mappedBy = "mestoByMId")
+    public List<Postojka> getPostojkasByMId() {
+        return postojkasByMId;
+    }
+
+    public void setPostojkasByMId(List<Postojka> postojkasByMId) {
+        this.postojkasByMId = postojkasByMId;
+    }
+}
Index: src/main/java/mk/ukim/finki/busngo/model/Patnik.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/Patnik.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
+++ src/main/java/mk/ukim/finki/busngo/model/Patnik.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
@@ -0,0 +1,45 @@
+package mk.ukim.finki.busngo.model;
+
+import jakarta.persistence.*;
+
+import java.util.Objects;
+
+@Entity
+public class Patnik {
+    private Long kId;
+    private Korisnik korisnikByKId;
+
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Id
+    @Column(name = "k_id", nullable = false)
+    public Long getkId() {
+        return kId;
+    }
+
+    public void setkId(Long kId) {
+        this.kId = kId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Patnik patnik = (Patnik) o;
+        return Objects.equals(kId, patnik.kId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(kId);
+    }
+
+    @OneToOne
+    @JoinColumn(name = "k_id", referencedColumnName = "k_id", nullable = false)
+    public Korisnik getKorisnikByKId() {
+        return korisnikByKId;
+    }
+
+    public void setKorisnikByKId(Korisnik korisnikByKId) {
+        this.korisnikByKId = korisnikByKId;
+    }
+}
Index: src/main/java/mk/ukim/finki/busngo/model/Postojka.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/Postojka.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
+++ src/main/java/mk/ukim/finki/busngo/model/Postojka.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
@@ -0,0 +1,79 @@
+package mk.ukim.finki.busngo.model;
+
+import jakarta.persistence.*;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+
+@Entity
+public class Postojka {
+    private Integer pId;
+    private String pIme;
+    private Integer mId;
+    private Mesto mestoByMId;
+    private List<Postojkanalinija> postojkanalinijasByPId;
+
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Id
+    @Column(name = "p_id", nullable = false)
+    public Integer getpId() {
+        return pId;
+    }
+
+    public void setpId(Integer pId) {
+        this.pId = pId;
+    }
+
+    @Basic
+    @Column(name = "p_ime", nullable = false)
+    public String getpIme() {
+        return pIme;
+    }
+
+    public void setpIme(String pIme) {
+        this.pIme = pIme;
+    }
+
+    @Basic
+    @Column(name = "m_id", nullable = true)
+    public Integer getmId() {
+        return mId;
+    }
+
+    public void setmId(Integer mId) {
+        this.mId = mId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Postojka postojka = (Postojka) o;
+        return Objects.equals(pId, postojka.pId) && Objects.equals(pIme, postojka.pIme) && Objects.equals(mId, postojka.mId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(pId, pIme, mId);
+    }
+
+    @ManyToOne
+    @JoinColumn(name = "m_id", referencedColumnName = "m_id")
+    public Mesto getMestoByMId() {
+        return mestoByMId;
+    }
+
+    public void setMestoByMId(Mesto mestoByMId) {
+        this.mestoByMId = mestoByMId;
+    }
+
+    @OneToMany(mappedBy = "postojkaByPId")
+    public List<Postojkanalinija> getPostojkanalinijasByPId() {
+        return postojkanalinijasByPId;
+    }
+
+    public void setPostojkanalinijasByPId(List<Postojkanalinija> postojkanalinijasByPId) {
+        this.postojkanalinijasByPId = postojkanalinijasByPId;
+    }
+}
Index: src/main/java/mk/ukim/finki/busngo/model/Postojkanalinija.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/Postojkanalinija.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
+++ src/main/java/mk/ukim/finki/busngo/model/Postojkanalinija.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
@@ -0,0 +1,100 @@
+package mk.ukim.finki.busngo.model;
+
+import jakarta.persistence.*;
+
+import java.util.Collection;
+import java.util.Objects;
+
+@Entity
+public class Postojkanalinija {
+    private Long pnlId;
+    private Short pnlRedenBroj;
+    private Integer liId;
+    private Integer pId;
+    private Linija linijaByLiId;
+    private Postojka postojkaByPId;
+    private Collection<Vozenje> vozenjesByPnlId;
+
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Id
+    @Column(name = "pnl_id", nullable = false)
+    public Long getPnlId() {
+        return pnlId;
+    }
+
+    public void setPnlId(Long pnlId) {
+        this.pnlId = pnlId;
+    }
+
+    @Basic
+    @Column(name = "pnl_reden_broj", nullable = false)
+    public Short getPnlRedenBroj() {
+        return pnlRedenBroj;
+    }
+
+    public void setPnlRedenBroj(Short pnlRedenBroj) {
+        this.pnlRedenBroj = pnlRedenBroj;
+    }
+
+    @Basic
+    @Column(name = "li_id", nullable = false)
+    public Integer getLiId() {
+        return liId;
+    }
+
+    public void setLiId(Integer liId) {
+        this.liId = liId;
+    }
+
+    @Basic
+    @Column(name = "p_id", nullable = false)
+    public Integer getpId() {
+        return pId;
+    }
+
+    public void setpId(Integer pId) {
+        this.pId = pId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Postojkanalinija that = (Postojkanalinija) o;
+        return Objects.equals(pnlId, that.pnlId) && Objects.equals(pnlRedenBroj, that.pnlRedenBroj) && Objects.equals(liId, that.liId) && Objects.equals(pId, that.pId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(pnlId, pnlRedenBroj, liId, pId);
+    }
+
+    @ManyToOne
+    @JoinColumn(name = "li_id", referencedColumnName = "li_id", nullable = false)
+    public Linija getLinijaByLiId() {
+        return linijaByLiId;
+    }
+
+    public void setLinijaByLiId(Linija linijaByLiId) {
+        this.linijaByLiId = linijaByLiId;
+    }
+
+    @ManyToOne
+    @JoinColumn(name = "p_id", referencedColumnName = "p_id", nullable = false)
+    public Postojka getPostojkaByPId() {
+        return postojkaByPId;
+    }
+
+    public void setPostojkaByPId(Postojka postojkaByPId) {
+        this.postojkaByPId = postojkaByPId;
+    }
+
+    @OneToMany(mappedBy = "postojkanalinijaByKacuvaPnlId")
+    public Collection<Vozenje> getVozenjesByPnlId() {
+        return vozenjesByPnlId;
+    }
+
+    public void setVozenjesByPnlId(Collection<Vozenje> vozenjesByPnlId) {
+        this.vozenjesByPnlId = vozenjesByPnlId;
+    }
+}
Index: src/main/java/mk/ukim/finki/busngo/model/SeSimnuvaNa.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/SeSimnuvaNa.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
+++ src/main/java/mk/ukim/finki/busngo/model/SeSimnuvaNa.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
@@ -0,0 +1,52 @@
+package mk.ukim.finki.busngo.model;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+
+import java.util.Objects;
+
+@Entity
+@jakarta.persistence.Table(name = "se_simnuva_na", schema = "project", catalog = "db_202324z_va_prj_busngo")
+@jakarta.persistence.IdClass(mk.ukim.finki.busngo.model.SeSimnuvaNaPK.class)
+public class SeSimnuvaNa {
+    private Long pnlId;
+
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Id
+    @jakarta.persistence.Column(name = "pnl_id", nullable = false)
+    public Long getPnlId() {
+        return pnlId;
+    }
+
+    public void setPnlId(Long pnlId) {
+        this.pnlId = pnlId;
+    }
+
+    private Long vozenjeId;
+
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Id
+    @jakarta.persistence.Column(name = "vozenje_id", nullable = false)
+    public Long getVozenjeId() {
+        return vozenjeId;
+    }
+
+    public void setVozenjeId(Long vozenjeId) {
+        this.vozenjeId = vozenjeId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        SeSimnuvaNa that = (SeSimnuvaNa) o;
+        return Objects.equals(pnlId, that.pnlId) && Objects.equals(vozenjeId, that.vozenjeId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(pnlId, vozenjeId);
+    }
+}
Index: src/main/java/mk/ukim/finki/busngo/model/SeSimnuvaNaPK.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/SeSimnuvaNaPK.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
+++ src/main/java/mk/ukim/finki/busngo/model/SeSimnuvaNaPK.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
@@ -0,0 +1,6 @@
+package mk.ukim.finki.busngo.model;
+
+import java.io.Serializable;
+
+public class SeSimnuvaNaPK implements Serializable {
+}
Index: src/main/java/mk/ukim/finki/busngo/model/Tipbilet.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/Tipbilet.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
+++ src/main/java/mk/ukim/finki/busngo/model/Tipbilet.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
@@ -0,0 +1,67 @@
+package mk.ukim.finki.busngo.model;
+
+import jakarta.persistence.*;
+
+import java.util.Collection;
+import java.util.Objects;
+
+@Entity
+public class Tipbilet {
+    private Integer tbId;
+    private Long tbTrajnost;
+    private String tbIme;
+    private Collection<Bilet> biletsByTbId;
+
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Id
+    @Column(name = "tb_id", nullable = false)
+    public Integer getTbId() {
+        return tbId;
+    }
+
+    public void setTbId(Integer tbId) {
+        this.tbId = tbId;
+    }
+
+    @Basic
+    @Column(name = "tb_trajnost", nullable = false)
+    public Long getTbTrajnost() {
+        return tbTrajnost;
+    }
+
+    public void setTbTrajnost(Long tbTrajnost) {
+        this.tbTrajnost = tbTrajnost;
+    }
+
+    @Basic
+    @Column(name = "tb_ime", nullable = false)
+    public String getTbIme() {
+        return tbIme;
+    }
+
+    public void setTbIme(String tbIme) {
+        this.tbIme = tbIme;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Tipbilet tipbilet = (Tipbilet) o;
+        return Objects.equals(tbId, tipbilet.tbId) && Objects.equals(tbTrajnost, tipbilet.tbTrajnost) && Objects.equals(tbIme, tipbilet.tbIme);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(tbId, tbTrajnost, tbIme);
+    }
+
+    @OneToMany(mappedBy = "tipbiletByTbId")
+    public Collection<Bilet> getBiletsByTbId() {
+        return biletsByTbId;
+    }
+
+    public void setBiletsByTbId(Collection<Bilet> biletsByTbId) {
+        this.biletsByTbId = biletsByTbId;
+    }
+}
Index: src/main/java/mk/ukim/finki/busngo/model/Vozac.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/Vozac.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
+++ src/main/java/mk/ukim/finki/busngo/model/Vozac.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
@@ -0,0 +1,45 @@
+package mk.ukim.finki.busngo.model;
+
+import jakarta.persistence.*;
+
+import java.util.Objects;
+
+@Entity
+public class Vozac {
+    private Long kId;
+    private Korisnik korisnikByKId;
+
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Id
+    @Column(name = "k_id", nullable = false)
+    public Long getkId() {
+        return kId;
+    }
+
+    public void setkId(Long kId) {
+        this.kId = kId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Vozac vozac = (Vozac) o;
+        return Objects.equals(kId, vozac.kId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(kId);
+    }
+
+    @OneToOne
+    @JoinColumn(name = "k_id", referencedColumnName = "k_id", nullable = false)
+    public Korisnik getKorisnikByKId() {
+        return korisnikByKId;
+    }
+
+    public void setKorisnikByKId(Korisnik korisnikByKId) {
+        this.korisnikByKId = korisnikByKId;
+    }
+}
Index: src/main/java/mk/ukim/finki/busngo/model/Vozenje.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/Vozenje.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
+++ src/main/java/mk/ukim/finki/busngo/model/Vozenje.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
@@ -0,0 +1,158 @@
+package mk.ukim.finki.busngo.model;
+
+import jakarta.persistence.*;
+import mk.ukim.finki.busngo.model.enums.VOZENJE_STATUS;
+
+import java.sql.Timestamp;
+import java.util.Objects;
+
+@Entity
+public class Vozenje {
+    private Long vozenjeId;
+    private Timestamp vozenjeStart;
+    private Timestamp vozenjeEnd;
+    private VOZENJE_STATUS vozenjeStatus;
+    private Long patnikKId;
+    private Long kacuvaPnlId;
+    private Long inlId;
+    private Long bId;
+    private Korisnik korisnikByPatnikKId;
+    private Postojkanalinija postojkanalinijaByKacuvaPnlId;
+    private Instancanalinija instancanalinijaByInlId;
+    private Bilet biletByBId;
+
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Id
+    @Column(name = "vozenje_id", nullable = false)
+    public Long getVozenjeId() {
+        return vozenjeId;
+    }
+
+    public void setVozenjeId(Long vozenjeId) {
+        this.vozenjeId = vozenjeId;
+    }
+
+    @Basic
+    @Column(name = "vozenje_start", nullable = false)
+    public Timestamp getVozenjeStart() {
+        return vozenjeStart;
+    }
+
+    public void setVozenjeStart(Timestamp vozenjeStart) {
+        this.vozenjeStart = vozenjeStart;
+    }
+
+    @Basic
+    @Column(name = "vozenje_end", nullable = true)
+    public Timestamp getVozenjeEnd() {
+        return vozenjeEnd;
+    }
+
+    public void setVozenjeEnd(Timestamp vozenjeEnd) {
+        this.vozenjeEnd = vozenjeEnd;
+    }
+
+    @Basic
+    @Column(name = "vozenje_status", nullable = false)
+    @Enumerated(EnumType.STRING)
+    public VOZENJE_STATUS getVozenjeStatus() {
+        return vozenjeStatus;
+    }
+
+    public void setVozenjeStatus(VOZENJE_STATUS vozenjeStatus) {
+        this.vozenjeStatus = vozenjeStatus;
+    }
+
+    @Basic
+    @Column(name = "patnik_k_id", nullable = true)
+    public Long getPatnikKId() {
+        return patnikKId;
+    }
+
+    public void setPatnikKId(Long patnikKId) {
+        this.patnikKId = patnikKId;
+    }
+
+    @Basic
+    @Column(name = "kacuva_pnl_id", nullable = false)
+    public Long getKacuvaPnlId() {
+        return kacuvaPnlId;
+    }
+
+    public void setKacuvaPnlId(Long kacuvaPnlId) {
+        this.kacuvaPnlId = kacuvaPnlId;
+    }
+
+    @Basic
+    @Column(name = "inl_id", nullable = false)
+    public Long getInlId() {
+        return inlId;
+    }
+
+    public void setInlId(Long inlId) {
+        this.inlId = inlId;
+    }
+
+    @Basic
+    @Column(name = "b_id", nullable = false)
+    public Long getbId() {
+        return bId;
+    }
+
+    public void setbId(Long bId) {
+        this.bId = bId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Vozenje vozenje = (Vozenje) o;
+        return Objects.equals(vozenjeId, vozenje.vozenjeId) && Objects.equals(vozenjeStart, vozenje.vozenjeStart) && Objects.equals(vozenjeEnd, vozenje.vozenjeEnd) && Objects.equals(vozenjeStatus, vozenje.vozenjeStatus) && Objects.equals(patnikKId, vozenje.patnikKId) && Objects.equals(kacuvaPnlId, vozenje.kacuvaPnlId) && Objects.equals(inlId, vozenje.inlId) && Objects.equals(bId, vozenje.bId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(vozenjeId, vozenjeStart, vozenjeEnd, vozenjeStatus, patnikKId, kacuvaPnlId, inlId, bId);
+    }
+
+    @ManyToOne
+    @JoinColumn(name = "patnik_k_id", referencedColumnName = "k_id")
+    public Korisnik getKorisnikByPatnikKId() {
+        return korisnikByPatnikKId;
+    }
+
+    public void setKorisnikByPatnikKId(Korisnik korisnikByPatnikKId) {
+        this.korisnikByPatnikKId = korisnikByPatnikKId;
+    }
+
+    @ManyToOne
+    @JoinColumn(name = "kacuva_pnl_id", referencedColumnName = "pnl_id", nullable = false)
+    public Postojkanalinija getPostojkanalinijaByKacuvaPnlId() {
+        return postojkanalinijaByKacuvaPnlId;
+    }
+
+    public void setPostojkanalinijaByKacuvaPnlId(Postojkanalinija postojkanalinijaByKacuvaPnlId) {
+        this.postojkanalinijaByKacuvaPnlId = postojkanalinijaByKacuvaPnlId;
+    }
+
+    @ManyToOne
+    @JoinColumn(name = "inl_id", referencedColumnName = "inl_id", nullable = false)
+    public Instancanalinija getInstancanalinijaByInlId() {
+        return instancanalinijaByInlId;
+    }
+
+    public void setInstancanalinijaByInlId(Instancanalinija instancanalinijaByInlId) {
+        this.instancanalinijaByInlId = instancanalinijaByInlId;
+    }
+
+    @ManyToOne
+    @JoinColumn(name = "b_id", referencedColumnName = "b_id", nullable = false)
+    public Bilet getBiletByBId() {
+        return biletByBId;
+    }
+
+    public void setBiletByBId(Bilet biletByBId) {
+        this.biletByBId = biletByBId;
+    }
+}
Index: src/main/java/mk/ukim/finki/busngo/model/Vraboten.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/Vraboten.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
+++ src/main/java/mk/ukim/finki/busngo/model/Vraboten.java	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
@@ -0,0 +1,79 @@
+package mk.ukim.finki.busngo.model;
+
+import jakarta.persistence.*;
+
+import java.sql.Date;
+import java.util.Objects;
+
+@Entity
+public class Vraboten{
+    private Long kId;
+    private Double vPlata;
+    private Date vDatumNaVrabotuvanje;
+    private Date vDatumPrekinVrabotuvanje;
+    private Korisnik korisnikByKId;
+
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Id
+    @Column(name = "k_id", nullable = false)
+    public Long getkId() {
+        return kId;
+    }
+
+    public void setkId(Long kId) {
+        this.kId = kId;
+    }
+
+    @Basic
+    @Column(name = "v_plata", nullable = false, precision = 0)
+    public Double getvPlata() {
+        return vPlata;
+    }
+
+    public void setvPlata(Double vPlata) {
+        this.vPlata = vPlata;
+    }
+
+    @Basic
+    @Column(name = "v_datum_na_vrabotuvanje", nullable = false)
+    public Date getvDatumNaVrabotuvanje() {
+        return vDatumNaVrabotuvanje;
+    }
+
+    public void setvDatumNaVrabotuvanje(Date vDatumNaVrabotuvanje) {
+        this.vDatumNaVrabotuvanje = vDatumNaVrabotuvanje;
+    }
+
+    @Basic
+    @Column(name = "v_datum_prekin_vrabotuvanje", nullable = true)
+    public Date getvDatumPrekinVrabotuvanje() {
+        return vDatumPrekinVrabotuvanje;
+    }
+
+    public void setvDatumPrekinVrabotuvanje(Date vDatumPrekinVrabotuvanje) {
+        this.vDatumPrekinVrabotuvanje = vDatumPrekinVrabotuvanje;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Vraboten vraboten = (Vraboten) o;
+        return Objects.equals(kId, vraboten.kId) && Objects.equals(vPlata, vraboten.vPlata) && Objects.equals(vDatumNaVrabotuvanje, vraboten.vDatumNaVrabotuvanje) && Objects.equals(vDatumPrekinVrabotuvanje, vraboten.vDatumPrekinVrabotuvanje);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(kId, vPlata, vDatumNaVrabotuvanje, vDatumPrekinVrabotuvanje);
+    }
+
+    @OneToOne
+    @JoinColumn(name = "k_id", referencedColumnName = "k_id", nullable = false)
+    public Korisnik getKorisnikByKId() {
+        return korisnikByKId;
+    }
+
+    public void setKorisnikByKId(Korisnik korisnikByKId) {
+        this.korisnikByKId = korisnikByKId;
+    }
+}
Index: src/main/java/mk/ukim/finki/busngo/model/entities/Avtobus.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/entities/Avtobus.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,24 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-
-import java.util.List;
-import java.util.Objects;
-
-@Data
-@Entity
-public class Avtobus {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "a_registracija")
-    private String aRegistracija;
-    @Basic
-    @Column(name = "a_seriski_broj")
-    private String aSeriskiBroj;
-    @Basic
-    @Column(name = "a_broj_sedista")
-    private Short aBrojSedista;
-    @OneToMany(mappedBy = "avtobusByARegistracija")
-    private List<Instancanalinija> instancanalinijaList;
-}
Index: src/main/java/mk/ukim/finki/busngo/model/entities/Bilet.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/entities/Bilet.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,39 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-import mk.ukim.finki.busngo.model.enums.BILET_STATUS;
-import org.hibernate.annotations.Type;
-
-import java.sql.Timestamp;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-
-@Data
-@Entity
-public class Bilet {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "b_id")
-    private Long BId;
-
-    @Basic
-    @Column(name = "b_datum_na_kupuvanje")
-    private Timestamp bDatumNaKupuvanje;
-
-    @Basic
-    @Column(name = "b_status", columnDefinition = "string_kratok")
-    @Enumerated(EnumType.STRING)
-    private BILET_STATUS bStatus;
-
-    @ManyToOne
-    @JoinColumn(name = "patnik_k_id", referencedColumnName = "k_id")
-    private Patnik korisnikByPatnikKId;
-
-    @ManyToOne
-    @JoinColumn(name = "tb_id", referencedColumnName = "tb_id")
-    private Tipbilet tipbiletByTbId;
-//    @OneToMany(mappedBy = "biletByBId")
-//    private List<Vozenje> vozenjesByBId;
-}
Index: src/main/java/mk/ukim/finki/busngo/model/entities/Instancanalinija.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/entities/Instancanalinija.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,37 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-
-import java.sql.Timestamp;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-
-@Data
-@Entity
-public class Instancanalinija {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "inl_id")
-    private Long inlId;
-    @Basic
-    @Column(name = "inl_datum_start")
-    private Timestamp inlDatumStart;
-    @Basic
-    @Column(name = "inl_datum_end")
-    private Timestamp inlDatumEnd;
-    @ManyToOne
-    @JoinColumn(name = "vozac_k_id", referencedColumnName = "k_id", nullable = false)
-    private Vozac korisnikByVozacKId;
-    @ManyToOne
-    @JoinColumn(name = "a_registracija", referencedColumnName = "a_registracija")
-    private Avtobus avtobusByARegistracija;
-    @ManyToOne
-    @JoinColumn(name = "li_id", referencedColumnName = "li_id", nullable = false)
-    private Linija linijaByLiId;
-    @OneToMany(mappedBy = "instancanalinijaByInlId")
-    private List<Kontroli> kontrolisByInlId;
-    @OneToMany(mappedBy = "instancanalinijaByInlId")
-    private List<Vozenje> vozenjesByInlId;
-}
Index: src/main/java/mk/ukim/finki/busngo/model/entities/Kazna.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/entities/Kazna.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,51 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-
-import java.sql.Timestamp;
-import java.util.Objects;
-
-@Data
-@Entity
-@Inheritance(strategy = InheritanceType.JOINED)
-public class Kazna {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "kz_id")
-    private Long kzId;
-
-    @Basic
-    @Column(name = "kz_iznos")
-    private Double kzIznos;
-
-    @Basic
-    @Column(name = "kz_plateno")
-    private Boolean kzPlateno;
-
-    @Basic
-    @Column(name = "kz_datum")
-    private Timestamp kzDatum;
-
-    @Basic
-    @Column(name = "kz_datum_plateno")
-    private Timestamp kzDatumPlateno;
-
-    @Basic
-    @Column(name = "kz_dokument")
-    private String kzDokument;
-
-    @ManyToOne
-    @JoinColumn(name = "kondukter_k_id", referencedColumnName = "k_id")
-    private Kondukter korisnikByKondukterKId;
-
-    @ManyToOne
-    @JoinColumn(name = "kontrola_id", referencedColumnName = "kontrola_id")
-    private Kontroli kontroliByKontrolaId;
-
-//    @OneToOne(mappedBy = "kaznaByKzId")
-//    private Kaznazaneregistriran kaznazaneregistriranByKzId;
-//
-//    @OneToOne(mappedBy = "kaznaByKzId")
-//    private Kaznazaregistriran kaznazaregistriranByKzId;
-}
Index: src/main/java/mk/ukim/finki/busngo/model/entities/Kaznazaneregistriran.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/entities/Kaznazaneregistriran.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,22 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-
-import java.util.Objects;
-
-@Data
-@Entity
-public class Kaznazaneregistriran extends Kazna {
-    @Basic
-    @Column(name = "kzn_telefon")
-    private String kznTelefon;
-
-    @Basic
-    @Column(name = "kzn_ime")
-    private String kznIme;
-
-    @Basic
-    @Column(name = "kzn_adresa")
-    private String kznAdresa;
-}
Index: src/main/java/mk/ukim/finki/busngo/model/entities/Kaznazaregistriran.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/entities/Kaznazaregistriran.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,14 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-
-import java.util.Objects;
-
-@Data
-@Entity
-public class Kaznazaregistriran extends Kazna{
-    @ManyToOne
-    @JoinColumn(name = "patnik_k_id", referencedColumnName = "k_id")
-    private Patnik korisnikByPatnikKId;
-}
Index: src/main/java/mk/ukim/finki/busngo/model/entities/Kondukter.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/entities/Kondukter.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,19 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-import java.util.Objects;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@Entity
-public class Kondukter extends Vraboten{
-    @OneToMany(mappedBy = "korisnikByKondukterKId")
-    private List<Kazna> kaznasByKId;
-    @OneToMany(mappedBy = "korisnikByKondukterKId")
-    private List<Kontroli> kontrolisByKId;
-
-}
Index: src/main/java/mk/ukim/finki/busngo/model/entities/Kontroli.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/entities/Kontroli.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,30 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-
-import java.sql.Timestamp;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-
-@Data
-@Entity
-public class Kontroli {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "kontrola_id")
-    private Long kontrolaId;
-    @Basic
-    @Column(name = "kontrola_datum")
-    private Timestamp kontrolaDatum;
-    @OneToMany(mappedBy = "kontroliByKontrolaId")
-    private List<Kazna> kaznasByKontrolaId;
-    @ManyToOne
-    @JoinColumn(name = "kondukter_k_id", referencedColumnName = "k_id")
-    private Kondukter korisnikByKondukterKId;
-    @ManyToOne
-    @JoinColumn(name = "inl_id", referencedColumnName = "inl_id")
-    private Instancanalinija instancanalinijaByInlId;
-
-}
Index: src/main/java/mk/ukim/finki/busngo/model/entities/Korisnik.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/entities/Korisnik.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,119 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-import mk.ukim.finki.busngo.model.enums.Role;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-
-@Data
-@Entity
-@Inheritance(strategy = InheritanceType.JOINED)
-public class Korisnik implements UserDetails {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "k_id")
-    private Long kId;
-
-    @Basic
-    @Column(name = "k_ime")
-    private String kIme;
-
-    @Basic
-    @Column(name = "k_adresa")
-    private String kAdresa;
-
-    @Basic
-    @Column(name = "k_telefon")
-    private String kTelefon;
-
-    @Basic
-    @Column(name = "k_email")
-    private String kEmail;
-
-    @Basic
-    @Column(name = "k_embg")
-    private String kEmbg;
-
-    @Basic
-    @Column(name = "k_is_admin")
-    private Boolean kIsAdmin;
-
-    @Basic
-    @Column(name = "k_lozinka")
-    private String kLozinka;
-
-    @Basic
-    @Column(name = "k_role")
-    @Enumerated(EnumType.STRING)
-    private Role kRole;
-
-//    @OneToMany(mappedBy = "korisnikByPatnikKId")
-//    private List<Bilet> biletsByKId;
-//    private boolean isAccountNonExpired = true;
-//    private boolean isAccountNonLocked = true;
-//    private boolean isCredentialsNonExpired =  true;
-//    private boolean isEnabled = true;
-
-
-    @Override
-    public Collection<? extends GrantedAuthority> getAuthorities() {
-        return Collections.singletonList(kRole);
-    }
-
-    @Override
-    public String getPassword() {
-        return kLozinka;
-    }
-
-    @Override
-    public String getUsername() {
-        return kEmail;
-    }
-
-    @Override
-    public boolean isAccountNonExpired() {
-        return true;
-    }
-
-    @Override
-    public boolean isAccountNonLocked() {
-        return true;
-    }
-
-    @Override
-    public boolean isCredentialsNonExpired() {
-        return true;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return true;
-    }
-
-
-//    @OneToMany(mappedBy = "korisnikByVozacKId")
-//    private List<Instancanalinija> instancanalinijasByKId;
-//    @OneToMany(mappedBy = "korisnikByKondukterKId")
-//    private List<Kazna> kaznasByKId;
-//    @OneToMany(mappedBy = "korisnikByPatnikKId")
-//    private List<Kaznazaregistriran> kaznazaregistriransByKId;
-//    @OneToOne(mappedBy = "korisnikByKId")
-//    private Kondukter kondukterByKId;
-//    @OneToMany(mappedBy = "korisnikByKondukterKId")
-//    private List<Kontroli> kontrolisByKId;
-//    @OneToOne(mappedBy = "korisnikByKId")
-//    private Patnik patnikByKId;
-//    @OneToOne(mappedBy = "korisnikByKId")
-//    private Vozac vozacByKId;
-//    @OneToMany(mappedBy = "korisnikByPatnikKId")
-//    private List<Vozenje> vozenjesByKId;
-//    @OneToOne(mappedBy = "korisnikByKId")
-//    private Vraboten vrabotenByKId;
-}
Index: src/main/java/mk/ukim/finki/busngo/model/entities/Linija.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/entities/Linija.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,29 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-
-import java.lang.invoke.CallSite;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-
-@Data
-@Entity
-public class Linija {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "li_id")
-    private Integer liId;
-    @Basic
-    @Column(name = "li_ime")
-    private String liIme;
-    @Basic
-    @Column(name = "li_pravec")
-    private String liPravec;
-    @OneToMany(mappedBy = "linijaByLiId")
-    private List<Instancanalinija> instancanalinijasByLiId;
-    @OneToMany(mappedBy = "linijaByLiId")
-    private List<Postojkanalinija> postojkanalinijasByLiId;
-
-}
Index: src/main/java/mk/ukim/finki/busngo/model/entities/Mesto.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/entities/Mesto.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,28 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-
-@Data
-@Entity
-public class Mesto {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "m_id")
-    private Integer mId;
-    @Basic
-    @Column(name = "m_grad")
-    private String mGrad;
-    @Basic
-    @Column(name = "m_opstina")
-    private String mOpstina;
-    @Basic
-    @Column(name = "m_ulica")
-    private String mUlica;
-    @OneToMany(mappedBy = "mestoByMId")
-    private List<Postojka> postojkasByMId;
-}
Index: src/main/java/mk/ukim/finki/busngo/model/entities/Patnik.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/entities/Patnik.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,22 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-import java.util.Objects;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@Entity
-public class Patnik extends Korisnik {
-    @OneToMany(mappedBy = "korisnikByPatnikKId")
-    private List<Bilet> biletsByKId;
-
-    @OneToMany(mappedBy = "korisnikByPatnikKId")
-    private List<Kaznazaregistriran> kaznazaregistriransByKId;
-
-    @OneToMany(mappedBy = "korisnikByPatnikKId")
-    private List<Vozenje> vozenjesByKId;
-}
Index: src/main/java/mk/ukim/finki/busngo/model/entities/Postojka.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/entities/Postojka.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,26 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-
-@Data
-@Entity
-public class Postojka {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "p_id")
-    private Integer pId;
-    @Basic
-    @Column(name = "p_ime")
-    private String pIme;
-    @ManyToOne
-    @JoinColumn(name = "m_id", referencedColumnName = "m_id")
-    private Mesto mestoByMId;
-    @OneToMany(mappedBy = "postojkaByPId")
-    private List<Postojkanalinija> postojkanalinijasByPId;
-
-}
Index: src/main/java/mk/ukim/finki/busngo/model/entities/Postojkanalinija.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/entities/Postojkanalinija.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,28 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-
-@Data
-@Entity
-public class Postojkanalinija {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "pnl_id")
-    private Long pnlId;
-    @Basic
-    @Column(name = "pnl_reden_broj")
-    private Short pnlRedenBroj;
-    @ManyToOne
-    @JoinColumn(name = "li_id", referencedColumnName = "li_id", nullable = false)
-    private Linija linijaByLiId;
-    @ManyToOne
-    @JoinColumn(name = "p_id", referencedColumnName = "p_id", nullable = false)
-    private Postojka postojkaByPId;
-    @OneToMany(mappedBy = "postojkanalinijaByKacuvaPnlId")
-    private List<Vozenje> vozenjesByPnlId;
-}
Index: src/main/java/mk/ukim/finki/busngo/model/entities/SeSimnuvaNa.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/entities/SeSimnuvaNa.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,17 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-
-import java.util.Objects;
-
-@Data
-@Entity
-//@jakarta.persistence.Table(name = "se_simnuva_na", schema = "project", catalog = "db_202324z_va_prj_busngo")
-//@jakarta.persistence.IdClass(mk.ukim.finki.busngo.model.entities.SeSimnuvaNaPK.class)
-public class SeSimnuvaNa {
-    @EmbeddedId
-    private SeSimnuvaNaPK id;
-
-
-}
Index: src/main/java/mk/ukim/finki/busngo/model/entities/SeSimnuvaNaPK.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/entities/SeSimnuvaNaPK.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,13 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.Embeddable;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-@Embeddable
-public class SeSimnuvaNaPK implements Serializable {
-    private Long vozenjeId;
-    private Long pnlId;
-}
Index: src/main/java/mk/ukim/finki/busngo/model/entities/Tipbilet.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/entities/Tipbilet.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,30 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-
-@Data
-@Entity
-public class Tipbilet {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "tb_id", columnDefinition = "serial")
-    private Long tbId;
-    @Basic
-    @Column(name = "tb_trajnost")
-    private Long tbTrajnost;
-    @Basic
-    @Column(name = "tb_cena")
-    private Float tbCena;
-    @Basic
-    @Column(name = "tb_ime")
-    private String tbIme;
-    @OneToMany(mappedBy = "tipbiletByTbId")
-    private List<Bilet> biletsByTbId;
-
-
-}
Index: src/main/java/mk/ukim/finki/busngo/model/entities/Vozac.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/entities/Vozac.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,17 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-import java.util.Objects;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@Entity
-public class Vozac extends Vraboten {
-    @OneToMany(mappedBy = "korisnikByVozacKId")
-    private List<Instancanalinija> instancanalinijasByKId;
-
-}
Index: src/main/java/mk/ukim/finki/busngo/model/entities/Vozenje.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/entities/Vozenje.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,40 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-import mk.ukim.finki.busngo.model.enums.VOZENJE_STATUS;
-
-import java.sql.Timestamp;
-import java.util.Objects;
-
-@Data
-@Entity
-public class Vozenje {
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Id
-    @Column(name = "vozenje_id")
-    private Long vozenjeId;
-    @Basic
-    @Column(name = "vozenje_start")
-    private Timestamp vozenjeStart;
-    @Basic
-    @Column(name = "vozenje_end")
-    private Timestamp vozenjeEnd;
-    @Basic
-    @Column(name = "vozenje_status")
-    @Enumerated(EnumType.STRING)
-    private VOZENJE_STATUS vozenjeStatus;
-    @ManyToOne
-    @JoinColumn(name = "patnik_k_id", referencedColumnName = "k_id")
-    private Patnik korisnikByPatnikKId;
-    @ManyToOne
-    @JoinColumn(name = "kacuva_pnl_id", referencedColumnName = "pnl_id", nullable = false)
-    private Postojkanalinija postojkanalinijaByKacuvaPnlId;
-    @ManyToOne
-    @JoinColumn(name = "inl_id", referencedColumnName = "inl_id", nullable = false)
-    private Instancanalinija instancanalinijaByInlId;
-    @ManyToOne
-    @JoinColumn(name = "b_id", referencedColumnName = "b_id", nullable = false)
-    private Bilet biletByBId;
-
-}
Index: src/main/java/mk/ukim/finki/busngo/model/entities/Vraboten.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/entities/Vraboten.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,27 +1,0 @@
-package mk.ukim.finki.busngo.model.entities;
-
-import jakarta.persistence.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-
-import java.sql.Date;
-import java.util.Objects;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@Entity
-public class Vraboten extends Korisnik {
-    @Basic
-    @Column(name = "v_plata")
-    private Double vPlata;
-
-    @Basic
-    @Column(name = "v_datum_na_vrabotuvanje")
-    private Date vDatumNaVrabotuvanje;
-
-    @Basic
-    @Column(name = "v_datum_prekin_vrabotuvanje")
-    private Date vDatumPrekinVrabotuvanje;
-
-}
Index: src/main/java/mk/ukim/finki/busngo/model/enums/Role.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/enums/Role.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,18 +1,0 @@
-package mk.ukim.finki.busngo.model.enums;
-
-
-import org.springframework.security.core.GrantedAuthority;
-
-public enum Role implements GrantedAuthority {
-    ROLE_USER,
-    ROLE_PASSENGER,
-    ROLE_DRIVER,
-    ROLE_CONDUCTOR,
-    ROLE_ADMIN;
-
-
-    @Override
-    public String getAuthority() {
-        return name();
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/model/enums/VrabotenType.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/enums/VrabotenType.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.enums;
-
-public enum VrabotenType {
-    KONDUKTER,
-    VOZAC,
-    ADMIN
-}
Index: src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidAvtobusRegistracijaException.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidAvtobusRegistracijaException.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class InvalidAvtobusRegistracijaException extends RuntimeException{
-    public InvalidAvtobusRegistracijaException() {
-        super("Invalid avtobus registracija!");
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidBiletIdException.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidBiletIdException.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class InvalidBiletIdException extends RuntimeException{
-    public InvalidBiletIdException() {
-        super("Invalid bilet id!");
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidCredentialsException.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidCredentialsException.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class InvalidCredentialsException extends RuntimeException{
-    public InvalidCredentialsException() {
-        super("The credentials entered are invalid!");
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidInstancaNaLinijaIdException.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidInstancaNaLinijaIdException.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class InvalidInstancaNaLinijaIdException extends RuntimeException{
-    public InvalidInstancaNaLinijaIdException() {
-        super("Invalid instanca na linija id!");
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidLinijaIdException.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidLinijaIdException.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class InvalidLinijaIdException extends RuntimeException{
-    public InvalidLinijaIdException() {
-        super("Invalid linija id!");
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidPatnikIdException.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidPatnikIdException.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class InvalidPatnikIdException extends RuntimeException{
-    public InvalidPatnikIdException() {
-        super("The given patnik id does not exist!");
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidPostojkaNaLinijaIdException.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidPostojkaNaLinijaIdException.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class InvalidPostojkaNaLinijaIdException extends RuntimeException {
-    public InvalidPostojkaNaLinijaIdException() {
-        super("Invalid postoja na linija id!");
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidTipBiletIdException.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidTipBiletIdException.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class InvalidTipBiletIdException extends RuntimeException{
-    public InvalidTipBiletIdException() {
-        super("Invalid tipbilet id!");
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidUserId.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidUserId.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class InvalidUserId extends RuntimeException{
-    public InvalidUserId() {
-        super("The iven user id does not exist!");
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidVozacIdException.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidVozacIdException.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class InvalidVozacIdException extends RuntimeException{
-    public InvalidVozacIdException() {
-        super("Invalid vozac id!");
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidVozenjeIdException.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/exceptions/InvalidVozenjeIdException.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class InvalidVozenjeIdException extends RuntimeException{
-    public InvalidVozenjeIdException() {
-        super("Inavlid vozenje id!");
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/model/exceptions/UnauthorizedAccess.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/exceptions/UnauthorizedAccess.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class UnauthorizedAccess extends RuntimeException {
-    public UnauthorizedAccess(String message) {
-        super(message);
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/model/exceptions/UserAlreadyExistsException.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/exceptions/UserAlreadyExistsException.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class UserAlreadyExistsException extends RuntimeException{
-    public UserAlreadyExistsException(String message) {
-        super(message);
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/model/exceptions/UserShouldNotBeTicketedException.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/model/exceptions/UserShouldNotBeTicketedException.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.model.exceptions;
-
-public class UserShouldNotBeTicketedException extends RuntimeException{
-    public UserShouldNotBeTicketedException(String message) {
-        super(message);
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/repository/AvtobusRepository.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/repository/AvtobusRepository.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,12 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Avtobus;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-
-import java.util.Optional;
-
-public interface AvtobusRepository extends JpaRepository<Avtobus, Long> {
-    @Query("select a from Avtobus a where a.aRegistracija = ?1")
-    Optional<Avtobus> findByARegistracija(String registracija);
-}
Index: src/main/java/mk/ukim/finki/busngo/repository/BiletRepository.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/repository/BiletRepository.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,18 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-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.enums.BILET_STATUS;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-import java.util.List;
-import java.util.Optional;
-
-
-public interface BiletRepository extends JpaRepository<Bilet, Long> {
-//    List<Bilet> findAllByKorisnikByPatnikKIdAndBStatus(Korisnik korisnik, BILET_STATUS status);
-//    List<Bilet> findAllByKorisnikByPatnikKId(Korisnik korisnik);
-    Optional<Bilet> findByBIdAndAndKorisnikByPatnikKId(Long bid, Patnik patnik);
-//    List<Bilet> findAllByKorisnikByPatnikKIdAndBStatus(Patnik patnik, BILET_STATUS status);
-}
Index: src/main/java/mk/ukim/finki/busngo/repository/InstancaNaLinijaRepository.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/repository/InstancaNaLinijaRepository.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,13 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Instancanalinija;
-import mk.ukim.finki.busngo.model.entities.Linija;
-import mk.ukim.finki.busngo.service.LinijaService;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-import java.util.List;
-
-public interface InstancaNaLinijaRepository extends JpaRepository<Instancanalinija, Long> {
-    List<Instancanalinija> findAllByLinijaByLiIdAndInlDatumEndIsNull(Linija linija);
-    List<Instancanalinija> findAllByInlDatumEndIsNull();
-}
Index: src/main/java/mk/ukim/finki/busngo/repository/KaznaRepository.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/repository/KaznaRepository.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,13 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Kazna;
-import mk.ukim.finki.busngo.model.entities.Kontroli;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.repository.NoRepositoryBean;
-
-import java.util.List;
-
-
-public interface KaznaRepository extends JpaRepository<Kazna, Long> {
-    List<Kazna> findAllByKontroliByKontrolaId(Kontroli kontroli);
-}
Index: src/main/java/mk/ukim/finki/busngo/repository/KaznaZaNeregistriranRepository.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/repository/KaznaZaNeregistriranRepository.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Kaznazaneregistriran;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface KaznaZaNeregistriranRepository extends JpaRepository<Kaznazaneregistriran, Long> {
-}
Index: src/main/java/mk/ukim/finki/busngo/repository/KaznaZaRegistriranRepository.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/repository/KaznaZaRegistriranRepository.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,11 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Kaznazaregistriran;
-import mk.ukim.finki.busngo.model.entities.Patnik;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-import java.util.List;
-
-public interface KaznaZaRegistriranRepository extends JpaRepository<Kaznazaregistriran, Long> {
-    List<Kaznazaregistriran> findAllByKorisnikByPatnikKId(Patnik patnik);
-}
Index: src/main/java/mk/ukim/finki/busngo/repository/KondukterRepository.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/repository/KondukterRepository.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,13 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Kondukter;
-import mk.ukim.finki.busngo.model.entities.Patnik;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-
-import java.util.Optional;
-
-public interface KondukterRepository extends JpaRepository<Kondukter, Long> {
-    @Query("SELECT p from Kondukter p where p.kEmail = ?1")
-    Optional<Kondukter> findByKEmail(String email);
-}
Index: src/main/java/mk/ukim/finki/busngo/repository/KontrolaRepository.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/repository/KontrolaRepository.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,11 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Instancanalinija;
-import mk.ukim.finki.busngo.model.entities.Kontroli;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-import java.util.List;
-
-public interface KontrolaRepository extends JpaRepository<Kontroli, Long> {
-    List<Kontroli> findAllByInstancanalinijaByInlId(Instancanalinija inl);
-}
Index: src/main/java/mk/ukim/finki/busngo/repository/KorisnikRepository.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/repository/KorisnikRepository.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,17 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Korisnik;
-import org.aspectj.apache.bcel.classfile.Module;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.NoRepositoryBean;
-
-import java.util.Optional;
-
-
-public interface KorisnikRepository extends JpaRepository<Korisnik, Long> {
-    @Query("SELECT k FROM Korisnik k WHERE k.kEmail = ?1 and k.kLozinka = ?2")
-    Optional<Korisnik> findByKEmailAndKLozinka(String kEmail, String kLozinka);
-    @Query("SELECT k FROM Korisnik k WHERE k.kEmail = ?1")
-    Optional<Korisnik> findByKEmail(String kEmail);
-}
Index: src/main/java/mk/ukim/finki/busngo/repository/LinijaRepository.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/repository/LinijaRepository.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,7 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Linija;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface LinijaRepository extends JpaRepository<Linija, Long> {
-}
Index: src/main/java/mk/ukim/finki/busngo/repository/PatnikRepository.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/repository/PatnikRepository.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,14 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Patnik;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Optional;
-
-public interface PatnikRepository extends JpaRepository<Patnik, Long> {
-    @Query("SELECT p from Patnik p where p.kEmail = ?1")
-    Optional<Patnik> findByKEmail(String email);
-}
Index: src/main/java/mk/ukim/finki/busngo/repository/PostojkaNaLinijaRepository.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/repository/PostojkaNaLinijaRepository.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,14 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Linija;
-import mk.ukim.finki.busngo.model.entities.Postojkanalinija;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.query.Jpa21Utils;
-
-import java.util.List;
-import java.util.Optional;
-
-public interface PostojkaNaLinijaRepository extends JpaRepository<Postojkanalinija, Long> {
-    List<Postojkanalinija> findAllByLinijaByLiId(Linija linija);
-    List<Postojkanalinija> findAllByLinijaByLiIdAndPnlRedenBrojGreaterThan(Linija linija, Short redenBroj);
-}
Index: src/main/java/mk/ukim/finki/busngo/repository/TipBIletRepository.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/repository/TipBIletRepository.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,8 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Tipbilet;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface TipBIletRepository extends JpaRepository<Tipbilet, Long> {
-
-}
Index: src/main/java/mk/ukim/finki/busngo/repository/VozacRepository.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/repository/VozacRepository.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,14 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Patnik;
-import mk.ukim.finki.busngo.model.entities.Vozac;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-
-import java.util.Optional;
-
-public interface VozacRepository extends JpaRepository<Vozac, Long> {
-
-    @Query("SELECT v from Vozac v where v.kEmail = ?1")
-    Optional<Vozac> findByKEmail(String email);
-}
Index: src/main/java/mk/ukim/finki/busngo/repository/VozenjeRepository.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/repository/VozenjeRepository.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,13 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-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 org.springframework.data.jpa.repository.JpaRepository;
-
-import java.util.List;
-
-public interface VozenjeRepository extends JpaRepository<Vozenje, Long> {
-    List<Vozenje> findAllByKorisnikByPatnikKId(Patnik patnik);
-    List<Vozenje> findAllByKorisnikByPatnikKIdAndAndVozenjeStatus(Patnik patnik, VOZENJE_STATUS vozenjeStatus);
-}
Index: src/main/java/mk/ukim/finki/busngo/repository/VrabotrenRepository.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/repository/VrabotrenRepository.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,8 +1,0 @@
-package mk.ukim.finki.busngo.repository;
-
-import mk.ukim.finki.busngo.model.entities.Vraboten;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface VrabotrenRepository extends JpaRepository<Vraboten, Long> {
-
-}
Index: src/main/java/mk/ukim/finki/busngo/service/AuthService.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/AuthService.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,13 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Korisnik;
-import mk.ukim.finki.busngo.model.enums.Role;
-import mk.ukim.finki.busngo.model.enums.VrabotenType;
-
-public interface AuthService {
-    Korisnik login(String email, String password);
-    Korisnik registerPatnik(String ime, String email, String password, String confirmPassword, String address, String telefon);
-    Korisnik registerVraboten(String ime, String email, String password, String confirmPassword, String address, String telefon, VrabotenType type, Double salary);
-
-    Korisnik register(String name, String email, String password, String confirmPassword, String address, String phone, Role role, Double salary);
-}
Index: src/main/java/mk/ukim/finki/busngo/service/AvtobusService.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/AvtobusService.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,12 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Avtobus;
-import mk.ukim.finki.busngo.repository.AvtobusRepository;
-
-import java.util.List;
-
-public interface AvtobusService {
-    List<Avtobus> findAll();
-
-    Avtobus findById(String aRegistracija);
-}
Index: src/main/java/mk/ukim/finki/busngo/service/BiletService.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/BiletService.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,27 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-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;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-public interface BiletService {
-    List<Bilet> listAll();
-    List<Bilet> findAllByPatnikId(Long id);
-    List<Bilet> findAllByPatnikIdAndStatus(Long id, BILET_STATUS status);
-
-    Bilet buy(Long tipbilet, LocalDateTime now, BILET_STATUS biletStatus, String name);
-
-    List<Bilet> findAllByPatnikEmail(String email);
-//    List<Bilet> findAllByPatnikEmailACTIVE(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();
-}
Index: src/main/java/mk/ukim/finki/busngo/service/InstancaNaLinijaService.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/InstancaNaLinijaService.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,17 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Instancanalinija;
-
-import javax.swing.event.ListDataEvent;
-import java.time.LocalDateTime;
-import java.util.List;
-
-public interface InstancaNaLinijaService {
-    List<Instancanalinija> findAll();
-    Instancanalinija findById(Long inlId);
-    Instancanalinija start(Long liId, String a_registracija, String email);
-    Instancanalinija end(Long inlId, String email);
-    List<Instancanalinija> findAllActive();
-
-    List<Instancanalinija> findByPnlId(Long pnlId);
-}
Index: src/main/java/mk/ukim/finki/busngo/service/KaznaService.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/KaznaService.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,12 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Kazna;
-
-import java.util.List;
-
-public interface KaznaService {
-    List<Kazna> findAll();
-    List<Kazna> findAllByKontrolaId(Long kontrolaId);
-    Kazna pay(Long kaznaId);
-    Kazna findById(Long id);
-}
Index: src/main/java/mk/ukim/finki/busngo/service/KaznaZaNeregistriranService.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/KaznaZaNeregistriranService.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,20 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Kaznazaneregistriran;
-import mk.ukim.finki.busngo.model.entities.Kaznazaregistriran;
-import org.springframework.security.core.Authentication;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
-
-public interface KaznaZaNeregistriranService {
-    List<Kaznazaneregistriran> findAll();
-    Kaznazaneregistriran findById(Long id);
-    Kaznazaneregistriran create(Long kontrolaId,
-                                 String dokument,
-                                Double iznos,
-                                 String telefon,
-                                 String ime,
-                                 String adresa,
-                                String email);
-}
Index: src/main/java/mk/ukim/finki/busngo/service/KaznaZaRegistriranService.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/KaznaZaRegistriranService.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,15 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Kazna;
-import mk.ukim.finki.busngo.model.entities.Kaznazaregistriran;
-import mk.ukim.finki.busngo.model.exceptions.UserShouldNotBeTicketedException;
-
-import java.util.List;
-
-public interface KaznaZaRegistriranService {
-    List<Kaznazaregistriran> findAllByPatnik(String email);
-
-    Kaznazaregistriran create(Long kontrolaId, String dokument, Double iznos, Long patnik, String email) throws UserShouldNotBeTicketedException;
-    Kaznazaregistriran pay(Long kaznaId);
-    Kaznazaregistriran findById(Long id);
-}
Index: src/main/java/mk/ukim/finki/busngo/service/KondukterService.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/KondukterService.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,10 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Kondukter;
-
-import java.util.List;
-
-public interface KondukterService {
-    List<Kondukter> findAll();
-    Kondukter findByEmail(String email);
-}
Index: src/main/java/mk/ukim/finki/busngo/service/KontrolaService.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/KontrolaService.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,14 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Kontroli;
-
-import java.util.List;
-
-public interface KontrolaService {
-    List<Kontroli> findAll();
-    Kontroli create(Long inlId, String email);
-
-    Kontroli findById(Long kontrolaId);
-
-    List<Kontroli> findAllByInl(Long inlId);
-}
Index: src/main/java/mk/ukim/finki/busngo/service/KorisnikService.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/KorisnikService.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,14 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Korisnik;
-import mk.ukim.finki.busngo.model.enums.Role;
-
-
-import java.util.List;
-
-public interface KorisnikService {
-    List<Korisnik> listAll();
-    Korisnik findById(Long id);
-    Korisnik loadUserByEmail(String email);
-
-}
Index: src/main/java/mk/ukim/finki/busngo/service/LinijaService.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/LinijaService.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,11 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Linija;
-
-import java.util.List;
-
-public interface LinijaService {
-    List<Linija> findAll();
-
-    Linija findById(Long liId);
-}
Index: src/main/java/mk/ukim/finki/busngo/service/PatnikService.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/PatnikService.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,16 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-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 java.util.List;
-
-public interface PatnikService {
-    List<Patnik> listAll();
-    Patnik findById(Long id);
-    Patnik loadUserByEmail(String email);
-
-    Patnik save(Korisnik korisnik);
-
-}
Index: src/main/java/mk/ukim/finki/busngo/service/PostojkaNaLinijaService.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/PostojkaNaLinijaService.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,12 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Postojkanalinija;
-
-import java.util.List;
-
-public interface PostojkaNaLinijaService {
-    List<Postojkanalinija> findAll();
-    Postojkanalinija findById(Long id);
-    List<Postojkanalinija> findByLinija(Long liId);
-    List<Postojkanalinija> findByLinijaAfterRedenBroj(Long liId, Short redenBroj);
-}
Index: src/main/java/mk/ukim/finki/busngo/service/TipBiletService.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/TipBiletService.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,9 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Tipbilet;
-
-import java.util.List;
-
-public interface TipBiletService {
-    List<Tipbilet> listAll();
-}
Index: src/main/java/mk/ukim/finki/busngo/service/VozacService.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/VozacService.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,11 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Vozac;
-import mk.ukim.finki.busngo.repository.VozacRepository;
-
-import java.util.List;
-
-public interface VozacService {
-    List<Vozac> findAll();
-    Vozac findByEmail(String email);
-}
Index: src/main/java/mk/ukim/finki/busngo/service/VozenjeService.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/VozenjeService.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,14 +1,0 @@
-package mk.ukim.finki.busngo.service;
-
-import mk.ukim.finki.busngo.model.entities.Vozenje;
-import mk.ukim.finki.busngo.model.enums.VOZENJE_STATUS;
-
-import java.util.List;
-
-public interface VozenjeService {
-    List<Vozenje> findVozenjaByPatnik(String email);
-    List<Vozenje> findVozenjaByPatnikAndStatus(String email, VOZENJE_STATUS status);
-    Vozenje start(String email, Long bId, Long pnlId, Long inlId);
-    Vozenje end(Long vozenjeId, Long pnlId);
-    Vozenje findById(Long id);
-}
Index: src/main/java/mk/ukim/finki/busngo/service/impl/AuthServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/impl/AuthServiceImpl.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,182 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.Kondukter;
-import mk.ukim.finki.busngo.model.entities.Korisnik;
-import mk.ukim.finki.busngo.model.entities.Patnik;
-import mk.ukim.finki.busngo.model.entities.Vozac;
-import mk.ukim.finki.busngo.model.enums.Role;
-import mk.ukim.finki.busngo.model.enums.VrabotenType;
-import mk.ukim.finki.busngo.model.exceptions.InvalidCredentialsException;
-import mk.ukim.finki.busngo.model.exceptions.UserAlreadyExistsException;
-import mk.ukim.finki.busngo.repository.KondukterRepository;
-import mk.ukim.finki.busngo.repository.KorisnikRepository;
-import mk.ukim.finki.busngo.repository.PatnikRepository;
-import mk.ukim.finki.busngo.repository.VozacRepository;
-import mk.ukim.finki.busngo.service.*;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Service;
-
-import java.sql.Date;
-import java.time.LocalDate;
-
-@Service
-public class AuthServiceImpl implements AuthService {
-    private final KorisnikRepository korisnikRepository;
-    private final PatnikRepository patnikRepository;
-    private final VozacRepository vozacRepository;
-    private final KondukterRepository kondukterRepository;
-    private final PasswordEncoder passwordEncoder;
-    private final PatnikService patnikService;
-    private final KondukterService kondukterService;
-    private final VozacService vozacService;
-
-    public AuthServiceImpl(KorisnikRepository korisnikRepository, PatnikRepository patnikRepository, VozacRepository vozacRepository, KondukterRepository kondukterRepository, PasswordEncoder passwordEncoder, PatnikService patnikService, KondukterService kondukterService, VozacService vozacService) {
-        this.korisnikRepository = korisnikRepository;
-        this.patnikRepository = patnikRepository;
-        this.vozacRepository = vozacRepository;
-        this.kondukterRepository = kondukterRepository;
-        this.passwordEncoder = passwordEncoder;
-        this.patnikService = patnikService;
-        this.kondukterService = kondukterService;
-        this.vozacService = vozacService;
-    }
-
-    @Override
-    public Korisnik login(String email, String password) {
-        if(email == null || password == null || email.isEmpty() || password.isEmpty())
-            throw new InvalidCredentialsException();
-        return korisnikRepository.findByKEmailAndKLozinka(email, password).orElseThrow(InvalidCredentialsException::new);
-    }
-
-    @Override
-    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();
-        }
-
-        if (!password.equals(confirmPassword)) {
-            throw new InvalidCredentialsException();
-        }
-
-        if(this.korisnikRepository.findByKEmail(email).isPresent()) {
-            throw new UserAlreadyExistsException(email);
-        }
-
-        Patnik korisnik = new Patnik();
-        korisnik.setKIme(ime);
-        korisnik.setKAdresa(address);
-        korisnik.setKLozinka(passwordEncoder.encode(password));
-        korisnik.setKEmail(email);
-        korisnik.setKTelefon(telefon);
-        korisnik.setKIsAdmin(false);
-
-        return patnikRepository.save(korisnik);
-    }
-
-    @Override
-    public Korisnik registerVraboten(String ime, String email, String password, String confirmPassword, String address, String telefon, VrabotenType type, Double salary) {
-        if (email == null || password == null || email.isEmpty() || password.isEmpty()) {
-            throw new InvalidCredentialsException();
-        }
-
-        if (!password.equals(confirmPassword)) {
-            throw new InvalidCredentialsException();
-        }
-
-        if(this.korisnikRepository.findByKEmail(email).isPresent()) {
-            throw new UserAlreadyExistsException(email);
-        }
-
-
-        switch (type){
-            case ADMIN:
-                Korisnik korisnik = new Korisnik();
-                korisnik.setKIme(ime);
-                korisnik.setKAdresa(address);
-                korisnik.setKLozinka(passwordEncoder.encode(password));
-                korisnik.setKEmail(email);
-                korisnik.setKTelefon(telefon);
-                korisnik.setKIsAdmin(true);
-                return korisnikRepository.save(korisnik);
-            case VOZAC:
-                Vozac vozac = new Vozac();
-                vozac.setKIme(ime);
-                vozac.setKAdresa(address);
-                vozac.setKLozinka(passwordEncoder.encode(password));
-                vozac.setKEmail(email);
-                vozac.setKTelefon(telefon);
-                vozac.setKIsAdmin(false);
-                vozac.setVPlata(salary);
-                vozac.setVDatumNaVrabotuvanje(Date.valueOf(LocalDate.now()));
-                this.korisnikRepository.save(vozac);
-
-                return vozacRepository.save(vozac);
-            case KONDUKTER:
-                Kondukter kondukter = new Kondukter();
-                kondukter.setKIme(ime);
-                kondukter.setKAdresa(address);
-                kondukter.setKLozinka(passwordEncoder.encode(password));
-                kondukter.setKEmail(email);
-                kondukter.setKTelefon(telefon);
-                kondukter.setKIsAdmin(false);
-                kondukter.setVPlata(salary);
-                kondukter.setVDatumNaVrabotuvanje(Date.valueOf(LocalDate.now()));
-                this.korisnikRepository.save(kondukter);
-
-                return kondukterRepository.save(kondukter);
-        }
-        return null;
-    }
-
-    @Override
-    public Korisnik register(String name, String email, String password, String confirmPassword, String address, String phone, Role role, Double salary) {
-        if (email == null || password == null || email.isEmpty() || password.isEmpty()) {
-            throw new InvalidCredentialsException();
-        }
-
-        if(!password.equals(confirmPassword)){
-            throw new InvalidCredentialsException();
-        }
-
-        if(role.equals(Role.ROLE_DRIVER)){
-            Vozac vozac = new Vozac();
-            vozac.setKIme(name);
-            vozac.setKAdresa(address);
-            vozac.setKLozinka(passwordEncoder.encode(password));
-            vozac.setKEmail(email);
-            vozac.setKTelefon(phone);
-            vozac.setKIsAdmin(role.equals(Role.ROLE_ADMIN));
-            vozac.setKRole(role);
-            vozac.setVPlata(salary != null ? salary : 0.0);
-            vozac.setVDatumNaVrabotuvanje(Date.valueOf(LocalDate.now()));
-            this.korisnikRepository.save(vozac);
-            return vozacRepository.save(vozac);
-        } else if(role.equals(Role.ROLE_CONDUCTOR)){
-            Kondukter kondukter = new Kondukter();
-            kondukter.setKIme(name);
-            kondukter.setKAdresa(address);
-            kondukter.setKLozinka(passwordEncoder.encode(password));
-            kondukter.setKEmail(email);
-            kondukter.setKTelefon(phone);
-            kondukter.setKIsAdmin(role.equals(Role.ROLE_ADMIN));
-            kondukter.setKRole(role);
-            kondukter.setVPlata(salary != null ? salary : 0.0);
-            kondukter.setVDatumNaVrabotuvanje(Date.valueOf(LocalDate.now()));
-            this.korisnikRepository.save(kondukter);
-            return kondukterRepository.save(kondukter);
-        } else {
-            Patnik patnik = new Patnik();
-            patnik.setKIme(name);
-            patnik.setKAdresa(address);
-            patnik.setKLozinka(passwordEncoder.encode(password));
-            patnik.setKEmail(email);
-            patnik.setKTelefon(phone);
-            patnik.setKIsAdmin(role.equals(Role.ROLE_ADMIN));
-            patnik.setKRole(role);
-            this.korisnikRepository.save(patnik);
-            return patnikRepository.save(patnik);
-        }
-    }
-
-
-}
Index: src/main/java/mk/ukim/finki/busngo/service/impl/AvtobusServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/impl/AvtobusServiceImpl.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,28 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.Avtobus;
-import mk.ukim.finki.busngo.model.exceptions.InvalidAvtobusRegistracijaException;
-import mk.ukim.finki.busngo.repository.AvtobusRepository;
-import mk.ukim.finki.busngo.service.AvtobusService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class AvtobusServiceImpl implements AvtobusService {
-    private final AvtobusRepository avtobusRepository;
-
-    public AvtobusServiceImpl(AvtobusRepository avtobusRepository) {
-        this.avtobusRepository = avtobusRepository;
-    }
-
-    @Override
-    public List<Avtobus> findAll() {
-        return avtobusRepository.findAll();
-    }
-
-    @Override
-    public Avtobus findById(String aRegistracija) {
-        return avtobusRepository.findByARegistracija(aRegistracija).orElseThrow(InvalidAvtobusRegistracijaException::new);
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/service/impl/BiletServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/impl/BiletServiceImpl.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,135 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-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;
-import org.thymeleaf.expression.Lists;
-
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class BiletServiceImpl implements BiletService {
-    private final BiletRepository biletRepository;
-    private final KorisnikService korisnikService;
-    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, PasswordEncoder passwordEncoder, KorisnikRepository korisnikRepository) {
-        this.biletRepository = biletRepository;
-        this.korisnikService = korisnikService;
-        this.tipBIletRepository = tipBIletRepository;
-        this.patnikService = patnikService;
-        this.passwordEncoder = passwordEncoder;
-        this.korisnikRepository = korisnikRepository;
-    }
-
-    @Override
-    public List<Bilet> listAll() {
-        return biletRepository.findAll();
-    }
-
-    @Override
-    public List<Bilet> findAllByPatnikId(Long id) {
-        Patnik patnik = patnikService.findById(id);
-        return patnik.getBiletsByKId();
-    }
-
-    @Override
-    public List<Bilet> findAllByPatnikIdAndStatus(Long id, BILET_STATUS status) {
-        Korisnik korisnik = korisnikService.findById(id);
-        return new ArrayList<>();
-    }
-
-    @Override
-    public Bilet buy(Long tipbilet, LocalDateTime now, BILET_STATUS biletStatus, String name) {
-        Tipbilet tipbilet1 = tipBIletRepository.findById(tipbilet).orElseThrow(InvalidTipBiletIdException::new);
-        Patnik korisnik = patnikService.loadUserByEmail(name);
-        Bilet bilet = new Bilet();
-        bilet.setBStatus(biletStatus);
-        bilet.setTipbiletByTbId(tipbilet1);
-        bilet.setBDatumNaKupuvanje(Timestamp.valueOf(now));
-        bilet.setKorisnikByPatnikKId(korisnik);
-        return biletRepository.save(bilet);
-    }
-
-    @Override
-    public List<Bilet> findAllByPatnikEmail(String email) {
-        Patnik patnik = patnikService.loadUserByEmail(email);
-        return patnik.getBiletsByKId();
-    }
-
-//    @Override
-//    public List<Bilet> findAllByPatnikEmailACTIVE(String email) {
-//        Patnik patnik = patnikService.loadUserByEmail(email);
-//        List<Bilet> allByKorisnikByPatnikKIdAndBStatus = biletRepository.findAllByKorisnikByPatnikKIdAndBStatus(patnik, BILET_STATUS.ACTIVE);
-//        List<Bilet> allByKorisnikByPatnikKIdAndBStatus1 = biletRepository.findAllByKorisnikByPatnikKIdAndBStatus(patnik, BILET_STATUS.INACTIVE);
-//        allByKorisnikByPatnikKIdAndBStatus1.addAll(allByKorisnikByPatnikKIdAndBStatus);
-//        return allByKorisnikByPatnikKIdAndBStatus1;
-//    }
-
-    @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!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
-//    }
-
-
-}
Index: src/main/java/mk/ukim/finki/busngo/service/impl/InstancaNaLinijaServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/impl/InstancaNaLinijaServiceImpl.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,72 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.*;
-import mk.ukim.finki.busngo.model.exceptions.InvalidInstancaNaLinijaIdException;
-import mk.ukim.finki.busngo.repository.InstancaNaLinijaRepository;
-import mk.ukim.finki.busngo.service.*;
-import org.springframework.stereotype.Service;
-
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Service
-public class InstancaNaLinijaServiceImpl implements InstancaNaLinijaService{
-    private final InstancaNaLinijaRepository instancaNaLinijaRepository;
-    private final VozacService vozacService;
-    private final AvtobusService avtobusService;
-    private final LinijaService linijaService;
-    private final PostojkaNaLinijaService postojkaNaLinijaService;
-
-    public InstancaNaLinijaServiceImpl(InstancaNaLinijaRepository instancaNaLinijaRepository, VozacService vozacService, AvtobusService avtobusService, LinijaService linijaService, PostojkaNaLinijaService postojkaNaLinijaService) {
-        this.instancaNaLinijaRepository = instancaNaLinijaRepository;
-        this.vozacService = vozacService;
-        this.avtobusService = avtobusService;
-        this.linijaService = linijaService;
-        this.postojkaNaLinijaService = postojkaNaLinijaService;
-    }
-
-    @Override
-    public List<Instancanalinija> findAll() {
-        return instancaNaLinijaRepository.findAll();
-    }
-
-    @Override
-    public Instancanalinija findById(Long inlId) {
-        return instancaNaLinijaRepository.findById(inlId).orElseThrow(InvalidInstancaNaLinijaIdException::new);
-    }
-
-    @Override
-    public Instancanalinija start(Long liId, String a_registracija, String email) {
-        Linija linija = linijaService.findById(liId);
-        Avtobus avtobus = avtobusService.findById(a_registracija);
-        Vozac vozac = vozacService.findByEmail(email);
-        Instancanalinija instancanalinija = new Instancanalinija();
-        instancanalinija.setLinijaByLiId(linija);
-        instancanalinija.setAvtobusByARegistracija(avtobus);
-        instancanalinija.setKorisnikByVozacKId(vozac);
-        instancanalinija.setInlDatumStart(Timestamp.valueOf(LocalDateTime.now()));
-
-        return instancaNaLinijaRepository.save(instancanalinija);
-    }
-
-    @Override
-    public Instancanalinija end(Long inlId, String email) {
-        Vozac vozac = vozacService.findByEmail(email);
-        Instancanalinija instancanalinija = this.findById(inlId);
-        instancanalinija.setInlDatumEnd(Timestamp.valueOf(LocalDateTime.now()));
-        return instancaNaLinijaRepository.save(instancanalinija);
-    }
-
-    @Override
-    public List<Instancanalinija> findAllActive() {
-        return instancaNaLinijaRepository.findAllByInlDatumEndIsNull();
-    }
-
-    @Override
-    public List<Instancanalinija> findByPnlId(Long pnlId) {
-        Postojkanalinija postojkanalinija = postojkaNaLinijaService.findById(pnlId);
-        Linija linijaByLiId = postojkanalinija.getLinijaByLiId();
-        return instancaNaLinijaRepository.findAllByLinijaByLiIdAndInlDatumEndIsNull(linijaByLiId);
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/service/impl/KaznaServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/impl/KaznaServiceImpl.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,47 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.Kazna;
-import mk.ukim.finki.busngo.model.entities.Kontroli;
-import mk.ukim.finki.busngo.repository.KaznaRepository;
-import mk.ukim.finki.busngo.service.KaznaService;
-import mk.ukim.finki.busngo.service.KontrolaService;
-import org.springframework.stereotype.Service;
-
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Service
-public class KaznaServiceImpl implements KaznaService {
-    private final KaznaRepository kaznaRepository;
-    private final KontrolaService kontrolaService;
-
-    public KaznaServiceImpl(KaznaRepository kaznaRepository, KontrolaService kontrolaService) {
-        this.kaznaRepository = kaznaRepository;
-        this.kontrolaService = kontrolaService;
-    }
-
-    @Override
-    public List<Kazna> findAll() {
-        return kaznaRepository.findAll();
-    }
-
-    @Override
-    public List<Kazna> findAllByKontrolaId(Long kontrolaId) {
-        Kontroli kontroli = kontrolaService.findById(kontrolaId);
-        return kaznaRepository.findAllByKontroliByKontrolaId(kontroli);
-    }
-
-    @Override
-    public Kazna pay(Long kaznaId) {
-        Kazna kazna = this.findById(kaznaId);
-        kazna.setKzPlateno(true);
-        kazna.setKzDatumPlateno(Timestamp.valueOf(LocalDateTime.now()));
-        return kaznaRepository.save(kazna);
-    }
-
-    @Override
-    public Kazna findById(Long id) {
-        return kaznaRepository.findById(id).orElseThrow(RuntimeException::new);
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/service/impl/KaznaZaNeregistriranServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/impl/KaznaZaNeregistriranServiceImpl.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,53 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.Kaznazaneregistriran;
-import mk.ukim.finki.busngo.model.entities.Kondukter;
-import mk.ukim.finki.busngo.model.entities.Kontroli;
-import mk.ukim.finki.busngo.repository.KaznaZaNeregistriranRepository;
-import mk.ukim.finki.busngo.service.KaznaZaNeregistriranService;
-import mk.ukim.finki.busngo.service.KondukterService;
-import mk.ukim.finki.busngo.service.KontrolaService;
-import org.springframework.stereotype.Service;
-
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.util.List;
-@Service
-public class KaznaZaNeregistriranServiceImpl implements KaznaZaNeregistriranService {
-    private final KaznaZaNeregistriranRepository kaznaZaNeregistriranRepository;
-    private final KontrolaService kontrolaService;
-    private final KondukterService kondukterService;
-
-    public KaznaZaNeregistriranServiceImpl(KaznaZaNeregistriranRepository kaznaZaNeregistriranRepository, KontrolaService kontrolaService, KondukterService kondukterService) {
-        this.kaznaZaNeregistriranRepository = kaznaZaNeregistriranRepository;
-        this.kontrolaService = kontrolaService;
-        this.kondukterService = kondukterService;
-    }
-
-    @Override
-    public List<Kaznazaneregistriran> findAll() {
-        return kaznaZaNeregistriranRepository.findAll();
-    }
-
-    @Override
-    public Kaznazaneregistriran findById(Long id) {
-        return kaznaZaNeregistriranRepository.findById(id).orElseThrow(RuntimeException::new);
-    }
-
-    @Override
-    public Kaznazaneregistriran create(Long kontrolaId, String dokument, Double iznos, String telefon, String ime, String adresa, String email) {
-        Kondukter byEmail = kondukterService.findByEmail(email);
-        Kontroli kontroli = kontrolaService.findById(kontrolaId);
-        Kaznazaneregistriran kaznazaneregistriran = new Kaznazaneregistriran();
-        kaznazaneregistriran.setKznAdresa(adresa);
-        kaznazaneregistriran.setKznIme(ime);
-        kaznazaneregistriran.setKznTelefon(telefon);
-        kaznazaneregistriran.setKzDatum(Timestamp.valueOf(LocalDateTime.now()));
-        kaznazaneregistriran.setKontroliByKontrolaId(kontroli);
-        kaznazaneregistriran.setKorisnikByKondukterKId(byEmail);
-        kaznazaneregistriran.setKzIznos(iznos);
-        kaznazaneregistriran.setKzDokument(dokument);
-        kaznazaneregistriran.setKzPlateno(false);
-        return kaznaZaNeregistriranRepository.save(kaznazaneregistriran);
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/service/impl/KaznaZaRegistriranServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/impl/KaznaZaRegistriranServiceImpl.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,76 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.*;
-import mk.ukim.finki.busngo.model.exceptions.UserShouldNotBeTicketedException;
-import mk.ukim.finki.busngo.repository.KaznaZaRegistriranRepository;
-import mk.ukim.finki.busngo.service.KaznaZaRegistriranService;
-import mk.ukim.finki.busngo.service.KondukterService;
-import mk.ukim.finki.busngo.service.KontrolaService;
-import mk.ukim.finki.busngo.service.PatnikService;
-import org.springframework.stereotype.Service;
-
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Service
-public class KaznaZaRegistriranServiceImpl implements KaznaZaRegistriranService {
-    private final PatnikService patnikService;
-    private final KaznaZaRegistriranRepository kaznaZaRegistriranRepository;
-    private final KontrolaService kontrolaService;
-    private final KondukterService kondukterService;
-
-    public KaznaZaRegistriranServiceImpl(PatnikService patnikService, KaznaZaRegistriranRepository kaznaZaRegistriranRepository, KontrolaService kontrolaService, KondukterService kondukterService) {
-        this.patnikService = patnikService;
-        this.kaznaZaRegistriranRepository = kaznaZaRegistriranRepository;
-        this.kontrolaService = kontrolaService;
-        this.kondukterService = kondukterService;
-    }
-
-    @Override
-    public List<Kaznazaregistriran> findAllByPatnik(String email) {
-        Patnik patnik = patnikService.loadUserByEmail(email);
-        return kaznaZaRegistriranRepository.findAllByKorisnikByPatnikKId(patnik);
-    }
-
-    @Override
-    public Kaznazaregistriran create(Long kontrolaId, String dokument, Double iznos, Long patnik, String email) {
-        Kontroli kontroli = kontrolaService.findById(kontrolaId);
-        Kondukter kondukter = kondukterService.findByEmail(email);
-        Patnik patnik1 = patnikService.findById(patnik);
-        Kaznazaregistriran kaznazaregistriran = new Kaznazaregistriran();
-        kaznazaregistriran.setKzDatum(Timestamp.valueOf(LocalDateTime.now()));
-        kaznazaregistriran.setKzDokument(dokument);
-        kaznazaregistriran.setKzIznos(iznos);
-        kaznazaregistriran.setKzPlateno(false);
-        kaznazaregistriran.setKontroliByKontrolaId(kontroli);
-        kaznazaregistriran.setKorisnikByPatnikKId(patnik1);
-        kaznazaregistriran.setKorisnikByKondukterKId(kondukter);
-        List<Vozenje> vozenjeList = patnik1.getVozenjesByKId().stream()
-                .filter(v -> v.getInstancanalinijaByInlId().getInlId().equals(kontroli.getInstancanalinijaByInlId().getInlId()))
-                .toList();
-        if(vozenjeList.isEmpty())
-            return kaznaZaRegistriranRepository.save(kaznazaregistriran);
-
-        throw new UserShouldNotBeTicketedException(String.format("Patnik with id: %d and email: %s has valid vozenje for the %d instance!",
-                patnik1.getKId(),
-                patnik1.getKEmail(),
-                kontroli.getInstancanalinijaByInlId().getInlId()));
-    }
-
-    @Override
-    public Kaznazaregistriran pay(Long kaznaId) {
-        Kaznazaregistriran kazna = this.findById(kaznaId);
-        if(!kazna.getKzPlateno()){
-            kazna.setKzPlateno(true);
-            kazna.setKzDatumPlateno(Timestamp.valueOf(LocalDateTime.now()));
-        }
-        return kaznaZaRegistriranRepository.save(kazna);
-    }
-
-    @Override
-    public Kaznazaregistriran findById(Long id) {
-        return kaznaZaRegistriranRepository.findById(id).orElseThrow(RuntimeException::new);
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/service/impl/KondukterServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/impl/KondukterServiceImpl.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,28 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.Kondukter;
-import mk.ukim.finki.busngo.model.exceptions.InvalidUserId;
-import mk.ukim.finki.busngo.repository.KondukterRepository;
-import mk.ukim.finki.busngo.service.KondukterService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class KondukterServiceImpl implements KondukterService {
-    private final KondukterRepository kondukterRepository;
-
-    public KondukterServiceImpl(KondukterRepository kondukterRepository) {
-        this.kondukterRepository = kondukterRepository;
-    }
-
-    @Override
-    public List<Kondukter> findAll() {
-        return kondukterRepository.findAll();
-    }
-
-    @Override
-    public Kondukter findByEmail(String email) {
-        return kondukterRepository.findByKEmail(email).orElseThrow(InvalidUserId::new);
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/service/impl/KontrolaServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/impl/KontrolaServiceImpl.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,55 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.Instancanalinija;
-import mk.ukim.finki.busngo.model.entities.Kondukter;
-import mk.ukim.finki.busngo.model.entities.Kontroli;
-import mk.ukim.finki.busngo.repository.KontrolaRepository;
-import mk.ukim.finki.busngo.service.InstancaNaLinijaService;
-import mk.ukim.finki.busngo.service.KondukterService;
-import mk.ukim.finki.busngo.service.KontrolaService;
-import org.springframework.stereotype.Service;
-
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Service
-public class KontrolaServiceImpl implements KontrolaService {
-    private final KontrolaRepository kontrolaRepository;
-    private final KondukterService kondukterService;
-    private final InstancaNaLinijaService instancaNaLinijaService;
-
-    public KontrolaServiceImpl(KontrolaRepository kontrolaRepository, KondukterService kondukterService, InstancaNaLinijaService instancaNaLinijaService) {
-        this.kontrolaRepository = kontrolaRepository;
-        this.kondukterService = kondukterService;
-        this.instancaNaLinijaService = instancaNaLinijaService;
-    }
-
-    @Override
-    public List<Kontroli> findAll() {
-        return kontrolaRepository.findAll();
-    }
-
-    @Override
-    public Kontroli create(Long inlId, String email) {
-        Kondukter kondukter = kondukterService.findByEmail(email);
-        Instancanalinija instancanalinija = instancaNaLinijaService.findById(inlId);
-        Kontroli kontroli = new Kontroli();
-        kontroli.setKontrolaDatum(Timestamp.valueOf(LocalDateTime.now()));
-        kontroli.setKorisnikByKondukterKId(kondukter);
-        kontroli.setInstancanalinijaByInlId(instancanalinija);
-
-        return kontrolaRepository.save(kontroli);
-    }
-
-    @Override
-    public Kontroli findById(Long kontrolaId) {
-        return kontrolaRepository.findById(kontrolaId).orElseThrow(RuntimeException::new);
-    }
-
-    @Override
-    public List<Kontroli> findAllByInl(Long inlId) {
-        Instancanalinija instancanalinija = instancaNaLinijaService.findById(inlId);
-        return kontrolaRepository.findAllByInstancanalinijaByInlId(instancanalinija);
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/service/impl/KorisnikServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/impl/KorisnikServiceImpl.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,35 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.Korisnik;
-import mk.ukim.finki.busngo.model.enums.Role;
-import mk.ukim.finki.busngo.model.exceptions.InvalidUserId;
-import mk.ukim.finki.busngo.repository.KorisnikRepository;
-import mk.ukim.finki.busngo.service.KorisnikService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class KorisnikServiceImpl implements KorisnikService {
-    private final KorisnikRepository korisnikRepository;
-
-    public KorisnikServiceImpl(KorisnikRepository korisnikRepository) {
-        this.korisnikRepository = korisnikRepository;
-    }
-
-
-    @Override
-    public List<Korisnik> listAll() {
-        return korisnikRepository.findAll();
-    }
-
-    @Override
-    public Korisnik findById(Long id) {
-        return korisnikRepository.findById(id).orElseThrow(InvalidUserId::new);
-    }
-
-    @Override
-    public Korisnik loadUserByEmail(String email) {
-        return korisnikRepository.findByKEmail(email).orElseThrow(InvalidUserId::new);
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/service/impl/LinijaServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/impl/LinijaServiceImpl.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,29 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.Linija;
-import mk.ukim.finki.busngo.model.exceptions.InvalidLinijaIdException;
-import mk.ukim.finki.busngo.repository.LinijaRepository;
-import mk.ukim.finki.busngo.service.LinijaService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class LinijaServiceImpl implements LinijaService {
-
-    private final LinijaRepository linijaRepository;
-
-    public LinijaServiceImpl(LinijaRepository linijaRepository) {
-        this.linijaRepository = linijaRepository;
-    }
-
-    @Override
-    public List<Linija> findAll() {
-        return linijaRepository.findAll();
-    }
-
-    @Override
-    public Linija findById(Long liId) {
-        return linijaRepository.findById(liId).orElseThrow(InvalidLinijaIdException::new);
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/service/impl/PatnikServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/impl/PatnikServiceImpl.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,55 +1,0 @@
-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;
-
-@Service
-public class PatnikServiceImpl implements PatnikService {
-    private final PatnikRepository patnikRepository;
-    private final InstancaNaLinijaService instancaNaLinijaService;
-
-    public PatnikServiceImpl(PatnikRepository patnikRepository, InstancaNaLinijaService instancaNaLinijaService) {
-        this.patnikRepository = patnikRepository;
-        this.instancaNaLinijaService = instancaNaLinijaService;
-    }
-
-    @Override
-    public List<Patnik> listAll() {
-        return  patnikRepository.findAll();
-    }
-
-    @Override
-    public Patnik findById(Long id) {
-        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);
-    }
-
-
-}
Index: src/main/java/mk/ukim/finki/busngo/service/impl/PostojkaNaLinijaServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/impl/PostojkaNaLinijaServiceImpl.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,44 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.Linija;
-import mk.ukim.finki.busngo.model.entities.Postojkanalinija;
-import mk.ukim.finki.busngo.model.exceptions.InvalidPostojkaNaLinijaIdException;
-import mk.ukim.finki.busngo.repository.PostojkaNaLinijaRepository;
-import mk.ukim.finki.busngo.service.LinijaService;
-import mk.ukim.finki.busngo.service.PostojkaNaLinijaService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class PostojkaNaLinijaServiceImpl implements PostojkaNaLinijaService {
-    private final PostojkaNaLinijaRepository postojkaNaLinijaRepository;
-    private final LinijaService linijaService;
-
-    public PostojkaNaLinijaServiceImpl(PostojkaNaLinijaRepository postojkaNaLinijaRepository, LinijaService linijaService) {
-        this.postojkaNaLinijaRepository = postojkaNaLinijaRepository;
-        this.linijaService = linijaService;
-    }
-
-    @Override
-    public List<Postojkanalinija> findAll() {
-        return postojkaNaLinijaRepository.findAll();
-    }
-
-    @Override
-    public Postojkanalinija findById(Long id) {
-        return postojkaNaLinijaRepository.findById(id).orElseThrow(InvalidPostojkaNaLinijaIdException::new);
-    }
-
-    @Override
-    public List<Postojkanalinija> findByLinija(Long liId) {
-        Linija linija = linijaService.findById(liId);
-        return postojkaNaLinijaRepository.findAllByLinijaByLiId(linija);
-    }
-
-    @Override
-    public List<Postojkanalinija> findByLinijaAfterRedenBroj(Long liId, Short redenBroj) {
-        Linija linija = linijaService.findById(liId);
-        return postojkaNaLinijaRepository.findAllByLinijaByLiIdAndPnlRedenBrojGreaterThan(linija, redenBroj);
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/service/impl/TipBiletServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/impl/TipBiletServiceImpl.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,22 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.Tipbilet;
-import mk.ukim.finki.busngo.repository.TipBIletRepository;
-import mk.ukim.finki.busngo.service.TipBiletService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class TipBiletServiceImpl implements TipBiletService {
-    private final TipBIletRepository tipBIletRepository;
-
-    public TipBiletServiceImpl(TipBIletRepository tipBIletRepository) {
-        this.tipBIletRepository = tipBIletRepository;
-    }
-
-    @Override
-    public List<Tipbilet> listAll() {
-        return tipBIletRepository.findAll();
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/service/impl/VozacServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/impl/VozacServiceImpl.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,28 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.Vozac;
-import mk.ukim.finki.busngo.model.exceptions.InvalidVozacIdException;
-import mk.ukim.finki.busngo.repository.VozacRepository;
-import mk.ukim.finki.busngo.service.VozacService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class VozacServiceImpl implements VozacService {
-    private final VozacRepository vozacRepository;
-
-    public VozacServiceImpl(VozacRepository vozacRepository) {
-        this.vozacRepository = vozacRepository;
-    }
-
-    @Override
-    public List<Vozac> findAll() {
-        return vozacRepository.findAll();
-    }
-
-    @Override
-    public Vozac findByEmail(String email) {
-        return vozacRepository.findByKEmail(email).orElseThrow(InvalidVozacIdException::new);
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/service/impl/VozenjeServiceImpl.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/service/impl/VozenjeServiceImpl.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,81 +1,0 @@
-package mk.ukim.finki.busngo.service.impl;
-
-import mk.ukim.finki.busngo.model.entities.*;
-import mk.ukim.finki.busngo.model.enums.BILET_STATUS;
-import mk.ukim.finki.busngo.model.enums.VOZENJE_STATUS;
-import mk.ukim.finki.busngo.model.exceptions.InvalidVozenjeIdException;
-import mk.ukim.finki.busngo.repository.VozenjeRepository;
-import mk.ukim.finki.busngo.service.*;
-import org.springframework.stereotype.Service;
-
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Service
-public class VozenjeServiceImpl  implements VozenjeService {
-    private final VozenjeRepository vozenjeRepository;
-    private final PatnikService patnikService;
-    private final BiletService biletService;
-    private final PostojkaNaLinijaService postojkaNaLinijaService;
-    private final InstancaNaLinijaService instancaNaLinijaService;
-
-    public VozenjeServiceImpl(VozenjeRepository vozenjeRepository, PatnikService patnikService, BiletService biletService, PostojkaNaLinijaService postojkaNaLinijaService, InstancaNaLinijaService instancaNaLinijaService) {
-        this.vozenjeRepository = vozenjeRepository;
-        this.patnikService = patnikService;
-        this.biletService = biletService;
-        this.postojkaNaLinijaService = postojkaNaLinijaService;
-        this.instancaNaLinijaService = instancaNaLinijaService;
-    }
-
-    @Override
-    public List<Vozenje> findVozenjaByPatnik(String email) {
-        Patnik patnik = patnikService.loadUserByEmail(email);
-        return vozenjeRepository.findAllByKorisnikByPatnikKId(patnik);
-    }
-
-    @Override
-    public List<Vozenje> findVozenjaByPatnikAndStatus(String email, VOZENJE_STATUS status) {
-        Patnik patnik = patnikService.loadUserByEmail(email);
-        return vozenjeRepository.findAllByKorisnikByPatnikKIdAndAndVozenjeStatus(patnik, status);
-    }
-
-    @Override
-    public Vozenje start(String email, Long bId, Long pnlId, Long inlId) {
-        Patnik patnik = patnikService.loadUserByEmail(email);
-        Bilet bilet = biletService.findBybIdAndPatnikEmail(bId, email);
-        Postojkanalinija postojkanalinija = postojkaNaLinijaService.findById(pnlId);
-        Instancanalinija instancanalinija = instancaNaLinijaService.findById(inlId);
-
-        Vozenje vozenje = new Vozenje();
-        vozenje.setVozenjeStart(Timestamp.valueOf(LocalDateTime.now()));
-        vozenje.setVozenjeStatus(VOZENJE_STATUS.ACTIVE);
-        vozenje.setInstancanalinijaByInlId(instancanalinija);
-        vozenje.setKorisnikByPatnikKId(patnik);
-        vozenje.setPostojkanalinijaByKacuvaPnlId(postojkanalinija);
-
-        if(bilet.getBStatus().equals(BILET_STATUS.INACTIVE))
-            bilet = biletService.activate(bId);
-        else if(biletService.checkExpiration(bId))
-            throw new RuntimeException("Bilet is expired!");
-        else if(bilet.getBStatus().equals(BILET_STATUS.EXPIRED))
-            throw new RuntimeException("Bilet is expired!");
-
-        vozenje.setBiletByBId(bilet);
-        return vozenjeRepository.save(vozenje);
-    }
-
-    @Override
-    public Vozenje end(Long vozenjeId, Long pnlId) {
-        // TODO : Relacija se simnuva na pnlId
-        Vozenje vozenje = this.findById(vozenjeId);
-        vozenje.setVozenjeEnd(Timestamp.valueOf(LocalDateTime.now()));
-        vozenje.setVozenjeStatus(VOZENJE_STATUS.FINISHED);
-        return vozenjeRepository.save(vozenje);
-    }
-
-    @Override
-    public Vozenje findById(Long id) {
-        return vozenjeRepository.findById(id).orElseThrow(InvalidVozenjeIdException::new);
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/web/BiletController.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/web/BiletController.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,75 +1,0 @@
-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;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.time.LocalDateTime;
-
-@Controller
-@RequestMapping("/bilet")
-public class BiletController {
-    private final BiletService biletService;
-    private final TipBiletService tipBiletService;
-    private final AuthService authService;
-    private final PatnikService patnikService;
-
-    public BiletController(BiletService biletService, TipBiletService tipBiletService, AuthService authService, PatnikService patnikService) {
-        this.biletService = biletService;
-        this.tipBiletService = tipBiletService;
-        this.authService = authService;
-        this.patnikService = patnikService;
-    }
-
-    @GetMapping()
-    public String getAllBileti(@RequestParam(required = false) Long id,
-                               @RequestParam(required = false) BILET_STATUS status,
-                               Model model,
-                               Authentication authentication){
-        model.addAttribute("bodyContent", "listBileti");
-        Patnik patnik = null;
-        try{
-            patnik = patnikService.loadUserByEmail(authentication.getName());
-            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";
-    }
-
-    @GetMapping("/kupi")
-    public String getKupiPage(Model model){
-        model.addAttribute("bodyContent", "kupiBilet");
-        model.addAttribute("tipbileti", tipBiletService.listAll());
-        return "master-template";
-    }
-
-    @PostMapping("/kupi")
-    public String kupiBilet(@RequestParam Long tipbilet, Authentication authentication){
-        biletService.buy(tipbilet, LocalDateTime.now(), BILET_STATUS.INACTIVE, authentication.getName());
-        return "redirect:/bilet";
-    }
-
-//    @GetMapping("/encode")
-//    public String encode(){
-//        biletService.encode();
-//        return "redirect:/bilet";
-//    }
-
-}
Index: src/main/java/mk/ukim/finki/busngo/web/InstancaNaLinijaController.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/web/InstancaNaLinijaController.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,78 +1,0 @@
-package mk.ukim.finki.busngo.web;
-
-import mk.ukim.finki.busngo.model.entities.Avtobus;
-import mk.ukim.finki.busngo.model.entities.Instancanalinija;
-import mk.ukim.finki.busngo.model.entities.Linija;
-import mk.ukim.finki.busngo.service.AvtobusService;
-import mk.ukim.finki.busngo.service.InstancaNaLinijaService;
-import mk.ukim.finki.busngo.service.KontrolaService;
-import mk.ukim.finki.busngo.service.LinijaService;
-import org.springframework.security.core.Authentication;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@Controller
-@RequestMapping("instanca-na-linija")
-public class InstancaNaLinijaController {
-    private final InstancaNaLinijaService instancaNaLinijaService;
-    private final LinijaService linijaService;
-    private final AvtobusService avtobusService;
-    private final KontrolaService kontrolaService;
-
-    public InstancaNaLinijaController(InstancaNaLinijaService instancaNaLinijaService, LinijaService linijaService, AvtobusService avtobusService, KontrolaService kontrolaService) {
-        this.instancaNaLinijaService = instancaNaLinijaService;
-        this.linijaService = linijaService;
-        this.avtobusService = avtobusService;
-        this.kontrolaService = kontrolaService;
-    }
-
-    @GetMapping()
-    public String getList(Model model){
-        model.addAttribute("bodyContent", "listInstanci");
-        model.addAttribute("inls", instancaNaLinijaService.findAllActive());
-
-        return "master-template";
-    }
-    @GetMapping("/start")
-    public String getStartPage(Model model){
-        List<Linija> linijaList = linijaService.findAll();
-        List<Avtobus> avtobusList = avtobusService.findAll();
-        model.addAttribute("avtobusi", avtobusList);
-        model.addAttribute("linii", linijaList);
-        model.addAttribute("bodyContent", "startInstanca");
-
-        return "master-template";
-    }
-
-    @PostMapping("/start")
-    public String startInstanca(@RequestParam String aRegistracija,
-                                @RequestParam Long liId,
-                                Model model,
-                                Authentication authentication){
-        Instancanalinija start = instancaNaLinijaService.start(liId, aRegistracija, authentication.getName());
-//        model.addAttribute("inl", start);
-//        model.addAttribute("bodyContent", "inlShow");
-
-        return "redirect:/instanca-na-linija/" + start.getInlId();
-    }
-
-    @GetMapping("/{inlId}")
-    public String getInlShow(@PathVariable Long inlId,
-                             Model model){
-        model.addAttribute("inl", instancaNaLinijaService.findById(inlId));
-        model.addAttribute("kontroli", kontrolaService.findAllByInl(inlId));
-        model.addAttribute("bodyContent", "inlShow");
-
-        return "master-template";
-    }
-
-    @PostMapping("/{inlId}/end")
-    public String endInstanca(@PathVariable Long inlId,
-                              Authentication authentication){
-        Instancanalinija ended = instancaNaLinijaService.end(inlId, authentication.getName());
-        return "redirect:/instanca-na-linija/" + ended.getInlId();
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/web/KaznaController.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/web/KaznaController.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,49 +1,0 @@
-package mk.ukim.finki.busngo.web;
-
-import mk.ukim.finki.busngo.model.entities.Patnik;
-import mk.ukim.finki.busngo.model.exceptions.InvalidPatnikIdException;
-import mk.ukim.finki.busngo.service.KaznaZaRegistriranService;
-import mk.ukim.finki.busngo.service.VozenjeService;
-import org.springframework.security.core.Authentication;
-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.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@Controller
-@RequestMapping("/kazna")
-public class KaznaController {
-    private final KaznaZaRegistriranService kaznaZaRegistriranService;
-
-    public KaznaController(KaznaZaRegistriranService kaznaZaRegistriranService) {
-        this.kaznaZaRegistriranService = kaznaZaRegistriranService;
-    }
-
-    @GetMapping()
-    public String getKaznaPage(Model model,
-                                 Authentication authentication){
-        model.addAttribute("bodyContent", "listKazni");
-        Patnik patnik = null;
-        try{
-            model.addAttribute("kazni", kaznaZaRegistriranService.findAllByPatnik(authentication.getName()));
-        }
-        catch (InvalidPatnikIdException e){
-            model.addAttribute("bodyContent", "listBileti");
-            model.addAttribute("hasError", true);
-            model.addAttribute("error", e.getMessage());
-            return "master-template";
-        }
-
-        return "master-template";
-    }
-
-    @PostMapping("/{id}/pay")
-    public String pay(@PathVariable Long id,
-                      Model model){
-        kaznaZaRegistriranService.pay(id);
-        return "redirect:/kazna";
-    }
-
-}
Index: src/main/java/mk/ukim/finki/busngo/web/KontrolaController.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/web/KontrolaController.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,85 +1,0 @@
-package mk.ukim.finki.busngo.web;
-
-import mk.ukim.finki.busngo.model.entities.Kontroli;
-import mk.ukim.finki.busngo.model.exceptions.UserShouldNotBeTicketedException;
-import mk.ukim.finki.busngo.service.*;
-import org.springframework.security.core.Authentication;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-@Controller
-@RequestMapping("/kontrola")
-public class KontrolaController {
-
-    private final KontrolaService kontrolaService;
-    private final KaznaZaRegistriranService kaznaZaRegistriranService;
-    private final KaznaZaNeregistriranService kaznaZaNeregistriranService;
-    private final KaznaService kaznaService;
-    private final PatnikService patnikService;
-    private final VozacService vozacService;
-    private final InstancaNaLinijaService instancaNaLinijaService;
-
-    public KontrolaController(KontrolaService kontrolaService, KaznaZaRegistriranService kaznaZaRegistriranService, KaznaZaNeregistriranService kaznaZaNeregistriranService, KaznaService kaznaService, PatnikService patnikService, VozacService vozacService, InstancaNaLinijaService instancaNaLinijaService) {
-        this.kontrolaService = kontrolaService;
-        this.kaznaZaRegistriranService = kaznaZaRegistriranService;
-        this.kaznaZaNeregistriranService = kaznaZaNeregistriranService;
-        this.kaznaService = kaznaService;
-        this.patnikService = patnikService;
-        this.vozacService = vozacService;
-        this.instancaNaLinijaService = instancaNaLinijaService;
-    }
-
-    @GetMapping("/{kontrolaId}")
-    public String get(@PathVariable Long kontrolaId,
-                      Model model){
-        model.addAttribute("bodyContent", "kontrola");
-        Kontroli kontroli = kontrolaService.findById(kontrolaId);
-
-        model.addAttribute("kontrola", kontroli);
-        model.addAttribute("kazni", kaznaService.findAllByKontrolaId(kontrolaId));
-        model.addAttribute("patnici", patnikService.listAll());
-        return "master-template";
-    }
-    @GetMapping("/start-for/{inlId}")
-    public String getStartPage(@PathVariable Long inlId,
-                               Model model,
-                               Authentication authentication){
-        model.addAttribute("bodyContent", "kontrola");
-        Kontroli kontroli = kontrolaService.create(inlId, authentication.getName());
-
-        model.addAttribute("kontrola", kontroli);
-        return "redirect:/kontrola/" + kontroli.getKontrolaId();
-    }
-
-    @PostMapping("/{kontrolaId}/kazni-registriran")
-    public String kazniRegistriran(@PathVariable Long kontrolaId,
-                                   @RequestParam String dokument,
-                                   @RequestParam Double iznos,
-                                   @RequestParam Long patnik,
-                                   Authentication authentication){
-        try {
-
-            kaznaZaRegistriranService.create(kontrolaId, dokument, iznos, patnik, authentication.getName());
-        }
-        catch (UserShouldNotBeTicketedException exception){
-            return "redirect:/kontrola/" + kontrolaId;
-        }
-
-        return "redirect:/kontrola/" + kontrolaId;
-    }
-
-    @PostMapping("/{kontrolaId}/kazni-neregistriran")
-    public String kazniNeregistriran(@PathVariable Long kontrolaId,
-                                   @RequestParam String dokument,
-                                   @RequestParam Double iznos,
-                                   @RequestParam String telefon,
-                                   @RequestParam String ime,
-                                   @RequestParam String adresa,
-                                   Authentication authentication){
-
-        kaznaZaNeregistriranService.create(kontrolaId, dokument, iznos, telefon, ime, adresa, authentication.getName());
-
-        return "redirect:/kontrola/" + kontrolaId;
-    }
-}
Index: src/main/java/mk/ukim/finki/busngo/web/LoginController.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/web/LoginController.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,47 +1,0 @@
-package mk.ukim.finki.busngo.web;
-
-import jakarta.servlet.http.HttpServletRequest;
-import mk.ukim.finki.busngo.model.entities.Korisnik;
-import mk.ukim.finki.busngo.model.exceptions.InvalidCredentialsException;
-import mk.ukim.finki.busngo.service.AuthService;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@Controller
-@RequestMapping("/login")
-public class LoginController {
-
-    private final AuthService authService;
-
-    public LoginController(AuthService authService) {
-        this.authService = authService;
-    }
-
-    @GetMapping
-    public String getLoginPage(Model model) {
-        model.addAttribute("bodyContent", "login");
-        return "master-template";
-    }
-
-    @PostMapping
-    public String login(HttpServletRequest request, Model model) {
-        Korisnik user = null;
-
-        try {
-            user = authService.login(request.getParameter("username"), request.getParameter("password"));
-        } catch (InvalidCredentialsException exception) {
-            model.addAttribute("bodyContent", "login");
-            model.addAttribute("hasError", true);
-            model.addAttribute("error", exception.getMessage());
-            return "master-template";
-        }
-
-        request.getSession().setAttribute("user", user);
-        return "redirect:/home";
-    }
-
-}
-
Index: src/main/java/mk/ukim/finki/busngo/web/RegisterController.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/web/RegisterController.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,73 +1,0 @@
-package mk.ukim.finki.busngo.web;
-
-import mk.ukim.finki.busngo.model.entities.Korisnik;
-import mk.ukim.finki.busngo.model.enums.Role;
-import mk.ukim.finki.busngo.model.enums.VrabotenType;
-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;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@Controller
-@RequestMapping("/register")
-public class RegisterController {
-    private final AuthService authService;
-    private final KorisnikService korisnikService;
-    private final PatnikService patnikService;
-
-    public RegisterController(AuthService authService, KorisnikService korisnikService, PatnikService patnikService) {
-        this.authService = authService;
-        this.korisnikService = korisnikService;
-        this.patnikService = patnikService;
-    }
-
-    @GetMapping
-    public String getRegisterPage(@RequestParam(required = false) String error, Model model) {
-        if(error != null && !error.isEmpty()) {
-            model.addAttribute("hasError", true);
-            model.addAttribute("error", error);
-        }
-
-        model.addAttribute("roles", Role.values());
-
-        model.addAttribute("bodyContent", "register");
-        return "master-template";
-    }
-
-    @PostMapping
-    public String register(@RequestParam String name,
-                           @RequestParam String email,
-                           @RequestParam String password,
-                           @RequestParam String confirmPassword,
-                           @RequestParam String address,
-                           @RequestParam String phone,
-                           @RequestParam Role role,
-                           @RequestParam(required = false) Double salary
-                           ) {
-        try{
-            Korisnik korisnik = authService.register(name, email, password, confirmPassword, address, phone, role, salary);
-
-            return "redirect:/login";
-        } catch (InvalidCredentialsException | UserAlreadyExistsException exception) {
-            return "redirect:/register?error=" + exception.getMessage();
-        }
-    }
-
-//    @PostMapping
-//    public String registerVraboten(@RequestParam String name,
-//                                   @RequestParam String email,
-//                                   @RequestParam String password,
-//                                   @RequestParam String confirmPassword,
-//                                   @RequestParam String address,
-//                                   @RequestParam String phone){
-//
-//    }
-
-}
Index: src/main/java/mk/ukim/finki/busngo/web/VozenjeController.java
===================================================================
--- src/main/java/mk/ukim/finki/busngo/web/VozenjeController.java	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,129 +1,0 @@
-package mk.ukim.finki.busngo.web;
-
-import mk.ukim.finki.busngo.model.entities.Linija;
-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;
-import mk.ukim.finki.busngo.service.*;
-import org.springframework.security.core.Authentication;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-@Controller
-@RequestMapping("/vozenje")
-public class VozenjeController {
-    private final VozenjeService vozenjeService;
-    private final PostojkaNaLinijaService postojkaNaLinijaService;
-    private final InstancaNaLinijaService instancaNaLinijaService;
-    private final BiletService biletService;
-
-    public VozenjeController(VozenjeService vozenjeService, PostojkaNaLinijaService postojkaNaLinijaService, InstancaNaLinijaService instancaNaLinijaService, BiletService biletService) {
-        this.vozenjeService = vozenjeService;
-        this.postojkaNaLinijaService = postojkaNaLinijaService;
-        this.instancaNaLinijaService = instancaNaLinijaService;
-        this.biletService = biletService;
-    }
-
-    @GetMapping()
-    public String getVozenjePage(Model model,
-                                 Authentication authentication,
-                                 @RequestParam(required = false) VOZENJE_STATUS status){
-        model.addAttribute("bodyContent", "listVozenja");
-        Patnik patnik = null;
-        try{
-            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){
-            model.addAttribute("bodyContent", "listBileti");
-            model.addAttribute("hasError", true);
-            model.addAttribute("error", e.getMessage());
-            return "master-template";
-        }
-
-        return "master-template";
-    }
-
-//    @GetMapping("/start")
-//    public String getStartVozenjePagePostojkaPage(Model model){
-//        model.addAttribute("postojki", postojkaNaLinijaService.findAll());
-//        model.addAttribute("bodyContent", "choosePostojka");
-//
-//        return "master-template";
-//    }
-    @GetMapping("/start")
-    public String getStartVozenjePageAll(@RequestParam(required = false) Long pnlId,
-                                         Model model,
-                                         Authentication authentication){
-        try{
-            if(pnlId != null){
-                model.addAttribute("postojka", postojkaNaLinijaService.findById(pnlId));
-                model.addAttribute("instanci", instancaNaLinijaService.findByPnlId(pnlId));
-            }
-            model.addAttribute("postojki", postojkaNaLinijaService.findAll());
-
-            model.addAttribute("bileti", biletService.findAllByPatnikEmail(authentication.getName()));
-            model.addAttribute("bodyContent", "startVozenje");
-        }
-        catch (InvalidPostojkaNaLinijaIdException | InvalidPatnikIdException exception){
-            model.addAttribute("bodyContent", "listBileti");
-            model.addAttribute("hasError", true);
-            model.addAttribute("error", exception.getMessage());
-            return "master-template";
-        }
-
-        return "master-template";
-    }
-
-    @PostMapping("/start")
-    public String startVozenje(@RequestParam Long pnlId,
-                               @RequestParam Long inlId,
-                               @RequestParam Long bId,
-                               Authentication authentication,
-                               Model model){
-        try{
-            vozenjeService
-                    .start(authentication.getName(), bId, pnlId, inlId);
-        }
-        catch (RuntimeException e){
-            System.out.println(e.getMessage());
-            model.addAttribute("bodyContent", "listBileti");
-            model.addAttribute("hasError", true);
-            model.addAttribute("error", e.getMessage());
-            return "master-template";
-        }
-
-        return "redirect:/vozenje";
-    }
-
-    @GetMapping("/{vozenjeId}/end")
-    public String getEndVozenje(@PathVariable Long vozenjeId,
-                                Model model){
-        Vozenje vozenje = vozenjeService.findById(vozenjeId);
-        model.addAttribute("vozenje", vozenjeService.findById(vozenjeId));
-        model.addAttribute("pnls",
-                postojkaNaLinijaService
-                        .findByLinijaAfterRedenBroj(Long.valueOf(vozenje
-                                .getInstancanalinijaByInlId()
-                                .getLinijaByLiId()
-                                .getLiId()),
-                                vozenje.getPostojkanalinijaByKacuvaPnlId().getPnlRedenBroj()));
-
-        model.addAttribute("bodyContent", "endVozenje");
-
-        return "master-template";
-    }
-
-    @PostMapping("/{vozenjeId}/end")
-    public String endVozenje(@PathVariable Long vozenjeId,
-                             @RequestParam Long pnlEndId){
-        Vozenje end = vozenjeService.end(vozenjeId, pnlEndId);
-        return "redirect:/vozenje";
-    }
-}
Index: src/main/resources/application.properties
===================================================================
--- src/main/resources/application.properties	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ src/main/resources/application.properties	(revision 24c39f958d6dc4a916ce04381e57b26a8163a342)
@@ -1,17 +1,11 @@
-#
-spring.datasource.url=jdbc:postgresql://localhost:8081/db_202324z_va_prj_busngo
-spring.datasource.username=db_202324z_va_prj_busngo_owner
-spring.datasource.password=d9f924580e7
-spring.datasource.driver-class-name=org.postgresql.Driver
 
+spring.datasource.url=jdbc:postgresql://localhost:5432/db_202324z_va_prj_busngo
 
 spring.datasource.hikari.connection-timeout=20000
 spring.datasource.hikari.maximum-pool-size=5
 
-#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 spring.jpa.properties.hibernate.jdbc.non_contextual_creation=true
-spring.jpa.properties.hibernate.default_schema=project_new
 
 spring.jpa.hibernate.ddl-auto=validate
 spring.jpa.show-sql=true
-
Index: src/main/resources/templates/choosePostojka.html
===================================================================
--- src/main/resources/templates/choosePostojka.html	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<div class="container" xmlns:th="http://www.thymeleaf.org">
-    <form class="form-signin mt-xl-5" method="get" action="/vozenje/choose-postojka">
-        <h2 class="form-signin-heading">Odberete postojka na koja se naogjate</h2>
-        <p>
-            <label for="pnlId" class="sr-only">Postojka</label>
-            <select class="form-control" name="pnlId" id="pnlId">
-                <option class="form-control" th:each="postojka : ${postojki}" th:text="${postojka.postojkaByPId.pIme}" th:value="${postojka.pnlId}" ></option>
-            </select>
-
-
-        </p>
-        <div class="col-md-3">
-            <button id="submit" class="btn btn-lg btn-primary btn-block" type="submit">Odberi</button>
-        </div>
-    </form>
-</div>
-
Index: src/main/resources/templates/endVozenje.html
===================================================================
--- src/main/resources/templates/endVozenje.html	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<div class="container" xmlns:th="http://www.thymeleaf.org">
-    <form class="form-signin mt-xl-5" method="post" th:action="@{'/vozenje/{id}/end'(id=${vozenje.vozenjeId})}">
-        <h2 class="form-signin-heading">Start vozenje</h2>
-
-        <p>
-            <label for="pnlId" class="sr-only">Postojka</label>
-            <select   class="form-control" name="pnlId" id="pnlId">
-                <option class="form-control"
-                        th:text="${vozenje.postojkanalinijaByKacuvaPnlId.postojkaByPId.pIme}"
-                        selected
-                        disabled
-                        th:value="${vozenje.postojkanalinijaByKacuvaPnlId.pnlId} "  ></option>
-<!--                        th:selected="${postojka!= null && postojka.pnlId == pos.pnlId} ? 'true' : 'false' " -->
-<!--                        th:disabled="${postojka!= null && postojka.pnlId != pos.pnlId} ? 'true' : 'false' "  -->
-
-            </select>
-        </p>
-
-        <p >
-            <label for="instanca" class="sr-only">Instanca</label>
-            <select id="instanca" name="inlId" class="form-control">
-                <option
-                        selected
-                        disabled
-                        th:value="${vozenje.instancanalinijaByInlId.inlId}"
-                        th:text="${vozenje.instancanalinijaByInlId.linijaByLiId.liIme} + ' - ' + ${vozenje.instancanalinijaByInlId.linijaByLiId.liPravec}"></option>
-            </select>
-        </p>
-
-        <p >
-            <label for="bilet" class="sr-only">Bilet</label>
-            <select id="bilet" name="bId" class="form-control">
-                <option
-                        selected
-                        disabled
-                        th:value="${vozenje.biletByBId.bId}"
-                        th:text="${vozenje.biletByBId.tipbiletByTbId.tbIme} + ' - ' + ${vozenje.biletByBId.bStatus.name()}"></option>
-            </select>
-        </p>
-
-        <p>
-            <label for="pnlEndId" class="sr-only">Postojka Simnuvanje</label>
-            <select   class="form-control" name="pnlEndId" id="pnlEndId">
-                <option class="form-control"
-                        th:each="pos : ${pnls}"
-                        th:text="${pos.postojkaByPId.pIme}"
-                        th:value="${pos.pnlId} "  ></option>
-
-
-            </select>
-        </p>
-
-        <div th:if="${param.error}" th:text="${param.error}" class="text-danger"></div>
-
-        <div class="row">
-            <div class="col-md-3">
-                <button id="submit" class="btn btn-lg btn-primary btn-block" type="submit">End</button>
-            </div>
-        </div>
-    </form>
-</div>
-
Index: src/main/resources/templates/fragments/footer.html
===================================================================
--- src/main/resources/templates/fragments/footer.html	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<footer class="text-black-50 mt-xl-5" xmlns:th="http://www.thymeleaf.org">
-    <div class="container">
-        <div class="row">
-            <div class="col-md-3 col-lg-4 col-xl-3">
-                <h5>About</h5>
-                <hr class="bg-white mb-2 mt-0 d-inline-block mx-auto w-25">
-                <p class="mb-0">
-                    Le Lorem Ipsum est simplement du faux texte employé dans la composition et la mise en page avant
-                    impression.
-                </p>
-            </div>
-
-            <div class="col-md-2 col-lg-2 col-xl-2 mx-auto">
-                <h5>Informations</h5>
-                <hr class="bg-white mb-2 mt-0 d-inline-block mx-auto w-25">
-                <ul class="list-unstyled">
-                    <li><a href="">Link 1</a></li>
-                    <li><a href="">Link 2</a></li>
-                    <li><a href="">Link 3</a></li>
-                    <li><a href="">Link 4</a></li>
-                </ul>
-            </div>
-
-            <div class="col-md-3 col-lg-2 col-xl-2 mx-auto">
-                <h5>Others links</h5>
-                <hr class="bg-white mb-2 mt-0 d-inline-block mx-auto w-25">
-                <ul class="list-unstyled">
-                    <li><a href="">Link 1</a></li>
-                    <li><a href="">Link 2</a></li>
-                    <li><a href="">Link 3</a></li>
-                    <li><a href="">Link 4</a></li>
-                </ul>
-            </div>
-
-            <div class="col-md-4 col-lg-3 col-xl-3">
-                <h5>Contact</h5>
-                <hr class="bg-white mb-2 mt-0 d-inline-block mx-auto w-25">
-                <ul class="list-unstyled">
-                    <li><i class="fa fa-home mr-2"></i> My company</li>
-                    <li><i class="fa fa-envelope mr-2"></i> email@example.com</li>
-                    <li><i class="fa fa-phone mr-2"></i> + 33 12 14 15 16</li>
-                    <li><i class="fa fa-print mr-2"></i> + 33 12 14 15 16</li>
-                </ul>
-            </div>
-        </div>
-    </div>
-</footer>
-
Index: src/main/resources/templates/fragments/header.html
===================================================================
--- src/main/resources/templates/fragments/header.html	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,68 +1,0 @@
-<header xmlns:th="http://www.thymeleaf.org">
-  <nav class="navbar navbar-expand-md navbar-dark bg-dark">
-    <div class="container">
-      <a class="navbar-brand" href="/">Bus & GO</a>
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault"
-              aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-
-      <div class="collapse navbar-collapse justify-content-end" id="navbarsExampleDefault">
-        <ul class="navbar-nav m-auto">
-          <li sec:authorize="hasRole('ROLE_PASSENGER')" class="nav-item m-auto">
-            <a class="nav-link active" href="/bilet">Bileti</a>
-          </li>
-          <li sec:authorize="hasAnyRole('ROLE_PASSENGER')" class="nav-item m-auto">
-            <a class="nav-link active" href="/vozenje">Vozenja</a>
-          </li>
-          <li sec:authorize="hasRole('ROLE_PASSENGER')" class="nav-item m-auto">
-            <a class="nav-link active" href="/kazna">Kazni</a>
-          </li>
-          <li sec:authorize="hasAnyRole('ROLE_CONDUCTOR', 'ROLE_DRIVER')" class="nav-item m-auto">
-            <a class="nav-link active" href="/instanca-na-linija">Instanci</a>
-          </li>
-        </ul>
-
-
-        <form class="form-inline my-2 my-lg-0">
-          <div class="input-group input-group-sm">
-            <input type="text" class="form-control" aria-label="Small"
-                   aria-describedby="inputGroup-sizing-sm"
-                   placeholder="Search...">
-            <div class="input-group-append">
-              <button type="button" class="btn btn-secondary btn-number">
-                <i class="fa fa-search"></i>
-              </button>
-            </div>
-          </div>
-        </form>
-        <ul class="nav navbar-nav navbar-right">
-
-          <li class="nav-item">
-            <a class="nav-link" href="#"></a>
-          </li>
-
-          <li class="nav-item" sec:authorize="isAuthenticated()">
-            <a href="#" class="btn btn-light btn-sm ml-3" sec:authentication="name">
-            </a>
-          </li>
-          <li class="nav-item" sec:authorize="isAuthenticated()">
-            <a class="btn btn-light btn-sm ml-3" href="/logout">
-              <i class="fa-solid fa-right-from-bracket"></i> Logout
-            </a>
-          </li>
-          <li class="nav-item" sec:authorize="isAnonymous()">
-            <a class="btn btn-light btn-sm ml-3" href="/login">
-              <i class="fa-solid fa-right-to-bracket"></i> Login
-            </a>
-          </li>
-          <li class="nav-item" sec:authorize="hasRole('ROLE_ADMIN')">
-            <a class="btn btn-light btn-sm ml-3" href="/admin">
-               Admin Menu
-            </a>
-          </li>
-        </ul>
-      </div>
-    </div>
-  </nav>
-</header>
Index: src/main/resources/templates/inlShow.html
===================================================================
--- src/main/resources/templates/inlShow.html	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,115 +1,0 @@
-<div class="container" xmlns:th="http://www.thymeleaf.org">
-    <form class="form-signin mt-xl-5" method="post" th:action="@{'/instanca-na-linija/{id}/end'(id=${inl.inlId})}">
-        <h2 class="form-signin-heading">Instanca na linija</h2>
-
-        <p>
-            <label for="aRegistracija" class="sr-only">Avtobus</label>
-            <input type="text"
-                   class="form-controll"
-                   th:value="${inl.avtobusByARegistracija.aRegistracija} "
-                   disabled
-                   name="aRegistracija"
-                   id="aRegistracija"
-            >
-        </p>
-
-        <p>
-            <label for="liId" class="sr-only">Linija</label>
-            <select id="liId" name="liId" class="form-control">
-                <option th:value="${inl.linijaByLiId.liId}"
-                        th:text="${inl.linijaByLiId.liIme} + ' - ' + ${inl.linijaByLiId.liPravec}"
-                        selected
-                        disabled></option>
-            </select>
-
-
-        </p>
-
-
-        <div th:if="${param.error}" th:text="${param.error}" class="text-danger"></div>
-
-        <div class="row">
-            <div class="col-md-3">
-                <button th:disabled="${inl.inlDatumEnd != null} ? 'true' : 'false'"
-                        id="submit"
-                        class="btn btn-lg btn-primary btn-block"
-                        type="submit"
-                        th:text="${inl.inlDatumEnd != null} ? 'Already ended' : 'End'"></button>
-            </div>
-        </div>
-    </form>
-
-    <div xmlns:th="http://www.thymeleaf.org">
-
-        <div class="container mb-4">
-            <div class="row">
-                <div class="col-12" >
-                    <div class="table-responsive">
-                        <table class="table table-striped">
-                            <thead>
-                            <tr>
-                                <th scope="col">#</th>
-                                <th scope="col">Timestamp</th>
-                                <th scope="col">Kondukter</th>
-                                <th scope="col"></th>
-                                <th scope="col"></th>
-                                <th scope="col"></th>
-                            </tr>
-                            </thead>
-                            <tbody>
-                            <tr th:each="kontrola : ${kontroli}" class="product">
-                                <td >
-                                    <a th:text="${kontrola.kontrolaId}" th:href="@{'/kontrola/{id}'(id= ${kontrola.kontrolaId})}"></a>
-                                </td>
-                                <td th:text="${kontrola.kontrolaDatum}"></td>
-                                <td th:text="${kontrola.korisnikByKondukterKId.kIme}"></td>
-
-                                <td class="text-right">
-                                    <!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
-                                    <!--                                    <form th:action="@{'/products/delete/{id}' (id=${vozenje.vozenjeId})}"-->
-                                    <!--                                          th:method="DELETE">-->
-                                    <!--                                        <button type="submit"-->
-                                    <!--                                                class="btn btn-sm btn-danger delete-product">-->
-                                    <!--                                            <i class="fas fa-trash-alt"></i> Delete-->
-                                    <!--                                        </button>-->
-                                    <!--                                    </form>-->
-                                    <!--                                </th:block>-->
-                                </td>
-                                <td>
-                                    <!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
-                                    <!--                                    <a th:href="@{'/products/edit-form/{id}' (id=${vozenje.vozenjeId})}"-->
-                                    <!--                                       class="btn btn-sm btn-info edit-product">-->
-                                    <!--                                        <i class="fas fa-edit"></i> Edit-->
-                                    <!--                                    </a>-->
-                                    <!--                                </th:block>-->
-                                </td>
-                                <td>
-<!--                                    <form th:action="@{'/kontrola/start-for/{id}'(id=${inl.inlId})}"-->
-<!--                                          th:method="GET">-->
-<!--                                        <button type="submit" class="btn btn-sm btn-success add-to-cart">-->
-<!--                                            <i class="fas fa-shopping-cart"></i> Kontrola-->
-<!--                                        </button>-->
-<!--                                    </form>-->
-                                </td>
-                            </tr>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-                <div class="col mb-3">
-                    <div class="row">
-                        <div class="col-sm-12 col-md-12">
-                            <a href="/instanca-na-linija/start" class="btn btn-block btn-dark add-product-btn">
-                                Start instanca
-                            </a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-
-
-</div>
-
Index: src/main/resources/templates/kontrola.html
===================================================================
--- src/main/resources/templates/kontrola.html	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,150 +1,0 @@
-<div xmlns:th="http://www.thymeleaf.org">
-
-    <div class="container mb-4">
-        <div class="row">
-            <div class="col-12" >
-
-    <form class="form-signin mt-xl-5" method="post" th:action="@{'/kontrola/{id}/kazni-neregistriran'(id=${kontrola.kontrolaId})}">
-        <h2 class="form-signin-heading">Kazna za neregirstiran</h2>
-
-        <p>
-            <label for="dokument" >Dokument</label>
-            <input class="form-control" name="dokument" id="dokument" type="text">
-        </p>
-
-
-        <p>
-            <label for="telefon" >Telefon</label>
-            <input class="form-control" name="telefon" id="telefon" type="text">
-        </p>
-
-        <p>
-            <label for="ime" >Ime</label>
-            <input class="form-control" name="ime" id="ime" type="text">
-        </p>
-
-        <p>
-            <label for="adresa" >Adresa</label>
-            <input class="form-control" name="adresa" id="adresa" type="text">
-        </p>
-
-
-        <p>
-            <label for="iznos" >Iznos</label>
-            <input class="form-control" name="iznos" id="iznos" type="number">
-        </p>
-
-
-        <div th:if="${param.error}" th:text="${param.error}" class="text-danger"></div>
-
-        <div class="row">
-            <div class="col-md-3">
-                <button id="submit" class="btn btn-lg btn-primary btn-block" type="submit">Kazni</button>
-            </div>
-        </div>
-    </form>
-
-
-
-    <form class="form-signin mt-xl-5" method="post" th:action="@{'/kontrola/{id}/kazni-registriran'(id=${kontrola.kontrolaId})}">
-        <h2 class="form-signin-heading">Kazna za regirstiran</h2>
-
-        <p>
-            <label for="dk" >Dokument</label>
-            <input class="form-control" name="dokument" id="dk" type="text">
-        </p>
-
-        <p>
-            <label for="iz" >Iznos</label>
-            <input class="form-control" name="iznos" id="iz" type="number">
-        </p>
-
-        <p>
-            <label for="patnik" >Patnik</label>
-            <select id="patnik" name="patnik" class="form-control">
-                <option th:each="patnik : ${patnici}"
-                        th:value="${patnik.kId}"
-                        th:text="${patnik.kIme} + ' - ' + ${patnik.kEmail}">
-
-                </option>
-            </select>
-        </p>
-
-
-        <div th:if="${param.error}" th:text="${param.error}" class="text-danger"></div>
-
-        <div class="row">
-            <div class="col-md-3">
-                <button id="sub" class="btn btn-lg btn-primary btn-block" type="submit">Kazni</button>
-            </div>
-        </div>
-    </form>
-
-            </div>
-        </div>
-    </div>
-
-
-
-
-
-
-
-
-
-    <div class="container mb-4">
-        <div class="row">
-            <div class="col-12" >
-                <div class="table-responsive">
-                    <table class="table table-striped">
-                        <thead>
-                        <tr>
-                            <th scope="col">#</th>
-                            <th scope="col">Iznos</th>
-                            <th scope="col">Plateno</th>
-                            <th scope="col">Dokument</th>
-                            <th scope="col"></th>
-                            <th scope="col"></th>
-                            <th scope="col"></th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr th:each="kazna : ${kazni}" class="product">
-                            <td th:text="${kazna.kzId}"></td>
-                            <td th:text="${kazna.kzIznos}"></td>
-                            <td th:text="${kazna.kzPlateno}"></td>
-                            <td th:text="${kazna.kzDokument}"></td>
-
-                            <td class="text-right">
-<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
-<!--                                    <form th:action="@{'/products/delete/{id}' (id=${kazna.kzId})}"-->
-<!--                                          th:method="DELETE">-->
-<!--                                        <button type="submit"-->
-<!--                                                class="btn btn-sm btn-danger delete-product">-->
-<!--                                            <i class="fas fa-trash-alt"></i> Delete-->
-<!--                                        </button>-->
-<!--                                    </form>-->
-<!--                                </th:block>-->
-                            </td>
-                            <td>
-<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
-<!--                                    <a th:href="@{'/products/edit-form/{id}' (id=${kazna.kzId})}"-->
-<!--                                       class="btn btn-sm btn-info edit-product">-->
-<!--                                        <i class="fas fa-edit"></i> Edit-->
-<!--                                    </a>-->
-<!--                                </th:block>-->
-                            </td>
-                            <td>
-
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-
-        </div>
-    </div>
-</div>
-
-
Index: src/main/resources/templates/kupiBilet.html
===================================================================
--- src/main/resources/templates/kupiBilet.html	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<div xmlns:th="http://www.thymeleaf.org">
-
-
-    <div style="width: 500px">
-        <form method="post" action="/bilet/kupi">
-
-            <p>
-                <label for="tipbilet" class="sr-only">Tip Bilet</label>
-                <select id="tipbilet" name="tipbilet" class="form-control">
-                    <option class="form-control" th:each="tip : ${tipbileti}" th:value="${tip.tbId}" th:text="${tip.tbIme}"></option>
-                </select>
-            </p>
-
-            <input type="submit" value="Kupi" class="btn btn-success">
-        </form>
-
-    </div>
-</div>
-
-
Index: src/main/resources/templates/listBileti.html
===================================================================
--- src/main/resources/templates/listBileti.html	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,67 +1,0 @@
-<div xmlns:th="http://www.thymeleaf.org">
-
-
-    <div class="container mb-4">
-        <div class="row">
-            <div class="col-12" >
-                <div class="table-responsive">
-                    <table class="table table-striped">
-                        <thead>
-                        <tr>
-                            <th scope="col">#</th>
-                            <th scope="col">Status</th>
-                            <th scope="col">Korisnik Ime</th>
-                            <th scope="col">Tip Bilet</th>
-                            <th scope="col"></th>
-                            <th scope="col"></th>
-                            <th scope="col"></th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr th:each="bilet : ${bileti}" class="product">
-                            <td th:text="${bilet.bId}"></td>
-                            <td th:text="${bilet.bStatus.name()}"></td>
-                            <td th:text="${bilet.korisnikByPatnikKId.kIme}"></td>
-                            <td th:text="${bilet.tipbiletByTbId.tbIme}"></td>
-
-                            <td class="text-right">
-<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
-<!--                                    <form th:action="@{'/products/delete/{id}' (id=${bilet.bId})}"-->
-<!--                                          th:method="DELETE">-->
-<!--                                        <button type="submit"-->
-<!--                                                class="btn btn-sm btn-danger delete-product">-->
-<!--                                            <i class="fas fa-trash-alt"></i> Delete-->
-<!--                                        </button>-->
-<!--                                    </form>-->
-<!--                                </th:block>-->
-                            </td>
-                            <td>
-<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
-<!--                                    <a th:href="@{'/products/edit-form/{id}' (id=${bilet.bId})}"-->
-<!--                                       class="btn btn-sm btn-info edit-product">-->
-<!--                                        <i class="fas fa-edit"></i> Edit-->
-<!--                                    </a>-->
-<!--                                </th:block>-->
-                            </td>
-                            <td>
-
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            <div class="col mb-3">
-                <div class="row">
-                    <div class="col-sm-12 col-md-12">
-                        <a href="/bilet/kupi" class="btn btn-block btn-dark add-product-btn">
-                            Kupi bilet
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-
Index: src/main/resources/templates/listInstanci.html
===================================================================
--- src/main/resources/templates/listInstanci.html	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<div xmlns:th="http://www.thymeleaf.org">
-
-
-    <div class="container mb-4">
-        <div class="row">
-            <div class="col-12" >
-                <div class="table-responsive">
-                    <table class="table table-striped">
-                        <thead>
-                        <tr>
-                            <th scope="col">#</th>
-                            <th scope="col">Vozac</th>
-                            <th scope="col">Avtobus</th>
-                            <th scope="col">Linija</th>
-                            <th scope="col">Pravec</th>
-                            <th scope="col">Start date</th>
-                            <th scope="col">End date</th>
-                            <th scope="col"></th>
-                            <th scope="col"></th>
-                            <th scope="col"></th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr th:each="inl : ${inls}" class="product">
-                            <td >
-                                <a th:text="${inl.inlId}" th:href="@{'/instanca-na-linija/{id}'(id= ${inl.inlId})}"></a>
-                            </td>
-                            <td th:text="${inl.korisnikByVozacKId.kIme}"></td>
-                            <td th:text="${inl.avtobusByARegistracija.aRegistracija}"></td>
-                            <td th:text="${inl.linijaByLiId.liIme}"></td>
-                            <td th:text="${inl.linijaByLiId.liPravec}"></td>
-                            <td th:text="${inl.inlDatumStart.toString()}"></td>
-                            <td th:text="${inl.inlDatumEnd != null} ? ${inl.inlDatumEnd.toString()} : 'Still active'"></td>
-
-                            <td class="text-right">
-<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
-<!--                                    <form th:action="@{'/products/delete/{id}' (id=${vozenje.vozenjeId})}"-->
-<!--                                          th:method="DELETE">-->
-<!--                                        <button type="submit"-->
-<!--                                                class="btn btn-sm btn-danger delete-product">-->
-<!--                                            <i class="fas fa-trash-alt"></i> Delete-->
-<!--                                        </button>-->
-<!--                                    </form>-->
-<!--                                </th:block>-->
-                            </td>
-                            <td>
-<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
-<!--                                    <a th:href="@{'/products/edit-form/{id}' (id=${vozenje.vozenjeId})}"-->
-<!--                                       class="btn btn-sm btn-info edit-product">-->
-<!--                                        <i class="fas fa-edit"></i> Edit-->
-<!--                                    </a>-->
-<!--                                </th:block>-->
-                            </td>
-                            <td>
-                                <form th:action="@{'/kontrola/start-for/{id}'(id=${inl.inlId})}"
-                                      th:method="GET">
-                                    <button type="submit" class="btn btn-sm btn-success add-to-cart">
-                                         Kontrola
-                                    </button>
-                                </form>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            <div class="col mb-3">
-                <div class="row">
-                    <div class="col-sm-12 col-md-12">
-                        <a href="/instanca-na-linija/start" class="btn btn-block btn-dark add-product-btn">
-                            Start instanca
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-
Index: src/main/resources/templates/listKazni.html
===================================================================
--- src/main/resources/templates/listKazni.html	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,76 +1,0 @@
-<div xmlns:th="http://www.thymeleaf.org">
-
-
-    <div class="container mb-4">
-        <div class="row">
-            <div class="col-12" >
-                <div class="table-responsive">
-                    <table class="table table-striped">
-                        <thead>
-                        <tr>
-                            <th scope="col">#</th>
-                            <th scope="col">Iznos</th>
-                            <th scope="col">Datum</th>
-                            <th scope="col">Plateno</th>
-                            <th scope="col">Datum plateno</th>
-                            <th scope="col">Dokument</th>
-                            <th scope="col"></th>
-                            <th scope="col"></th>
-                            <th scope="col"></th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr th:each="kazna : ${kazni}" class="product">
-                            <td th:text="${kazna.kzId}"></td>
-                            <td th:text="${kazna.kzIznos}"></td>
-                            <td th:text="${kazna.kzDatum}"></td>
-                            <td th:text="${kazna.kzPlateno}"></td>
-                            <td th:text="${kazna.kzDatumPlateno}"></td>
-                            <td th:text="${kazna.kzDokument}"></td>
-
-                            <td class="text-right">
-<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
-<!--                                    <form th:action="@{'/products/delete/{id}' (id=${kazna.kzId})}"-->
-<!--                                          th:method="DELETE">-->
-<!--                                        <button type="submit"-->
-<!--                                                class="btn btn-sm btn-danger delete-product">-->
-<!--                                            <i class="fas fa-trash-alt"></i> Delete-->
-<!--                                        </button>-->
-<!--                                    </form>-->
-<!--                                </th:block>-->
-                            </td>
-                            <td>
-<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
-<!--                                    <a th:href="@{'/products/edit-form/{id}' (id=${kazna.kzId})}"-->
-<!--                                       class="btn btn-sm btn-info edit-product">-->
-<!--                                        <i class="fas fa-edit"></i> Edit-->
-<!--                                    </a>-->
-<!--                                </th:block>-->
-                            </td>
-                            <td>
-                                <form th:action="@{'/kazna/{id}/pay' (id=${kazna.kzId})}"
-                                      th:method="POST">
-                                    <button type="submit" class="btn btn-sm btn-success add-to-cart">
-                                         Pay
-                                    </button>
-                                </form>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            <div class="col mb-3">
-                <div class="row">
-                    <div class="col-sm-12 col-md-12">
-                        <a href="/bilet/kupi" class="btn btn-block btn-dark add-product-btn">
-                            Kupi bilet
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-
Index: src/main/resources/templates/listVozenja.html
===================================================================
--- src/main/resources/templates/listVozenja.html	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,83 +1,0 @@
-<div xmlns:th="http://www.thymeleaf.org">
-    <section class="jumbotron text-center">
-        <div class="container">
-            <h1 class="jumbotron-heading">WEB PROGRAMMING SHOP</h1>
-            <h3 class="jumbotron-heading">All products</h3>
-        </div>
-    </section>
-
-    <form method="get" action="/vozenje">
-        <select name="status">
-            <option th:each="status : ${vozStatus}" th:value="${status}" th:text="${status.name()}"></option>
-        </select>
-
-        <input type="submit" value="Search">
-    </form>
-
-    <div class="container mb-4">
-        <div class="row">
-            <div class="col-12" >
-                <div class="table-responsive">
-                    <table class="table table-striped">
-                        <thead>
-                        <tr>
-                            <th scope="col">#</th>
-                            <th scope="col">Status</th>
-                            <th scope="col">Korisnik Ime</th>
-                            <th scope="col">Bilet Id</th>
-                            <th scope="col">Tip Bilet</th>
-                            <th scope="col"></th>
-                            <th scope="col"></th>
-                            <th scope="col"></th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr th:each="vozenje : ${vozenja}" class="product">
-                            <td th:text="${vozenje.vozenjeId}"></td>
-                            <td th:text="${vozenje.vozenjeStatus.name()}"></td>
-                            <td th:text="${vozenje.korisnikByPatnikKId.kIme}"></td>
-                            <td th:text="${vozenje.biletByBId.bId}"></td>
-                            <td th:text="${vozenje.biletByBId.tipbiletByTbId.tbIme}"></td>
-
-                            <td class="text-right">
-                                <th:block  >
-                                    <form th:action="@{'/vozenje/{id}/end' (id=${vozenje.vozenjeId})}"
-                                          th:hidden="${vozenje.vozenjeStatus.name().equals('FINISHED')} ? 'true' : 'false'"
-                                          th:method="GET">
-                                        <button type="submit"
-                                                class="btn btn-sm btn-danger delete-product">
-                                            <i class="fas fa-trash-alt"></i> End
-                                        </button>
-                                    </form>
-                                </th:block>
-                            </td>
-                            <td>
-<!--                                <th:block sec:authorize="hasRole('ROLE_ADMIN')">-->
-<!--                                    <a th:href="@{'/products/edit-form/{id}' (id=${vozenje.vozenjeId})}"-->
-<!--                                       class="btn btn-sm btn-info edit-product">-->
-<!--                                        <i class="fas fa-edit"></i> Edit-->
-<!--                                    </a>-->
-<!--                                </th:block>-->
-                            </td>
-                            <td>
-
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-            <div class="col mb-3">
-                <div class="row">
-                    <div class="col-sm-12 col-md-12">
-                        <a href="/vozenje/start" class="btn btn-block btn-dark add-product-btn">
-                            Start vozenje
-                        </a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-
Index: src/main/resources/templates/login.html
===================================================================
--- src/main/resources/templates/login.html	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,27 +1,0 @@
-<div class="container" xmlns:th="http://www.thymeleaf.org">
-    <form class="form-signin mt-xl-5" method="post" action="/login">
-        <h2 class="form-signin-heading">Sign in</h2>
-        <p>
-            <label for="username" class="sr-only">Username</label>
-            <input type="text" id="username" name="username" class="form-control" placeholder="Username" required=""
-                   autofocus="">
-        </p>
-        <p>
-            <label for="password" class="sr-only">Password</label>
-            <input type="password" id="password" name="password" class="form-control" placeholder="Password"
-                   required="">
-        </p>
-
-        <div th:if="${param.error}" th:text="${param.error}" class="text-danger"></div>
-
-        <div class="row">
-            <div class="col-md-3">
-                <button id="submit" class="btn btn-lg btn-primary btn-block" type="submit">Sign in</button>
-            </div>
-            <div class="col-md-3">
-                <a href="/register" class="btn btn-lg btn-block btn-light">Register here</a>
-            </div>
-        </div>
-    </form>
-</div>
-
Index: src/main/resources/templates/master-template.html
===================================================================
--- src/main/resources/templates/master-template.html	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,30 +1,0 @@
-<!DOCTYPE html>
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>Products</title>
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
-          integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
-            integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
-            crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
-            integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1"
-            crossorigin="anonymous"></script>
-    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
-            integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
-            crossorigin="anonymous"></script>
-    <script src="https://kit.fontawesome.com/e59232f0a1.js" crossorigin="anonymous"></script>
-</head>
-<body>
-<header th:replace="fragments/header"/>
-
-<div th:text="${error}"></div>
-
-<section th:include="${bodyContent}">
-
-</section>
-<footer th:replace="fragments/footer"/>
-</body>
-</html>
-
Index: src/main/resources/templates/register.html
===================================================================
--- src/main/resources/templates/register.html	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<div xmlns:th="http://www.thymeleaf.org">
-
-  <div class="container mb-4">
-    <form class="form-signin mt-xl-5" method="post" action="/register">
-      <h2 class="form-signin-heading">Register</h2>
-      <p>
-        <label for="username" class="sr-only">Email</label>
-        <input type="text" id="username" name="email" class="form-control" placeholder="Email" required="" autofocus="">
-      </p>
-      <p>
-        <label for="password" class="sr-only">Password</label>
-        <input type="password" id="password" name="password" class="form-control" placeholder="Password" required="">
-      </p>
-      <p>
-        <label for="repeatedPassword" class="sr-only">Repeat Password</label>
-        <input type="password" id="repeatedPassword" name="confirmPassword" class="form-control" placeholder="Repeat Password" required="">
-      </p>
-      <p>
-        <label for="name" class="sr-only">Name</label>
-        <input type="text" id="name" name="name" class="form-control" placeholder="Name" required="" autofocus="">
-      </p>
-      <p>
-        <label for="surname" class="sr-only">Address</label>
-        <input type="text" id="surname" name="address" class="form-control" placeholder="Address" required="" autofocus="">
-      </p>
-      <p>
-        <label for="phone" class="sr-only">Phone</label>
-        <input type="text" id="phone" name="phone" class="form-control" placeholder="Phone" required="" autofocus="">
-      </p>
-
-<!--      <p sec:authorize="hasRole('ROLE_ADMIN')">-->
-        <label for="role" class="sr-only">Role</label>
-        <select name="role" id="role">
-          <option th:each="role : ${roles}"
-                  th:text="${role.name()}"
-                  th:value="${role}" ></option>
-        </select>
-<!--      </p>-->
-
-      <p sec:authorize="hasRole('ROLE_ADMIN')">
-        <label for="salary" class="sr-only">Salary</label>
-        <input type="number" id="salary" name="salary">
-      </p>
-
-
-
-
-      <th:block th:if="${hasError}">
-        <div th:text="${error}" class="text-danger"></div>
-      </th:block>
-
-      <button class="btn btn-lg btn-primary btn-block" type="submit">Sign up</button>
-    </form>
-    <a href="/login" class="btn btn-block btn-light">Already have an account? Login here!</a>
-  </div>
-
-</div>
Index: src/main/resources/templates/startInstanca.html
===================================================================
--- src/main/resources/templates/startInstanca.html	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<div class="container" xmlns:th="http://www.thymeleaf.org">
-    <form class="form-signin mt-xl-5" method="post" action="/instanca-na-linija/start">
-        <h2 class="form-signin-heading">Start instanca na linija</h2>
-
-        <p>
-            <label for="aRegistracija" class="sr-only">Avtobus</label>
-            <select   class="form-control" name="aRegistracija" id="aRegistracija">
-                <option class="form-control" th:each="avtobus : ${avtobusi}" th:text="${avtobus.aRegistracija}"  th:value="${avtobus.aRegistracija} "  ></option>
-            </select>
-        </p>
-
-        <p>
-            <label for="liId" class="sr-only">Password</label>
-            <select id="liId" name="liId" class="form-control">
-                <option th:each="linija : ${linii}" th:value="${linija.liId}" th:text="${linija.liIme} + ' - ' + ${linija.liPravec}"></option>
-            </select>
-        </p>
-
-
-        <div th:if="${param.error}" th:text="${param.error}" class="text-danger"></div>
-
-        <div class="row">
-            <div class="col-md-3">
-                <button id="submit" class="btn btn-lg btn-primary btn-block" type="submit">Start</button>
-            </div>
-        </div>
-    </form>
-</div>
-
Index: src/main/resources/templates/startVozenje.html
===================================================================
--- src/main/resources/templates/startVozenje.html	(revision 8b875e649f470a3da43d250a59b91c529cb64a1a)
+++ 	(revision )
@@ -1,35 +1,0 @@
-<div class="container" xmlns:th="http://www.thymeleaf.org">
-    <form class="form-signin mt-xl-5" th:method="${postojka} != null ? 'post' : 'get'" action="/vozenje/start">
-        <h2 class="form-signin-heading">Start vozenje</h2>
-
-        <p>
-            <label for="pnlId" class="sr-only">Postojka</label>
-            <select   class="form-control" name="pnlId" id="pnlId">
-                <option class="form-control" th:each="pos : ${postojki}" th:text="${pos.postojkaByPId.pIme}" th:selected="${postojka!= null && postojka.pnlId == pos.pnlId} ? 'true' : 'false' " th:disabled="${postojka!= null && postojka.pnlId != pos.pnlId} ? 'true' : 'false' "  th:value="${pos.pnlId} "  ></option>
-            </select>
-        </p>
-
-        <p th:hidden="${instanci} == null">
-            <label for="instanca" class="sr-only">Password</label>
-            <select id="instanca" name="inlId" class="form-control">
-                <option th:each="instanca : ${instanci}" th:value="${instanca.inlId}" th:text="${instanca.linijaByLiId.liIme} + ' - ' + ${instanca.linijaByLiId.liPravec}"></option>
-            </select>
-        </p>
-
-        <p th:hidden="${instanci} == null">
-            <label for="bilet" class="sr-only">Password</label>
-            <select id="bilet" name="bId" class="form-control">
-                <option th:each="bilet : ${bileti}" th:value="${bilet.bId}" th:text="${bilet.tipbiletByTbId.tbIme} + ' - ' + ${bilet.bStatus.name()}"></option>
-            </select>
-        </p>
-
-        <div th:if="${param.error}" th:text="${param.error}" class="text-danger"></div>
-
-        <div class="row">
-            <div class="col-md-3">
-                <button id="submit" class="btn btn-lg btn-primary btn-block" type="submit">Start</button>
-            </div>
-        </div>
-    </form>
-</div>
-
