Changeset d14176d for src/main/java/project/fmo/app/projcetfmo/Model/Dostava.java

Timestamp:

07/07/23 12:14:58 (12 months ago)

Author:

HristijanMitic00 <hristijan.mitic.01@…>

Branches:

main

Parents:

1dd9226

Message:

First commit

File:

• src/main/java/project/fmo/app/projcetfmo/Model/Dostava.java (modified) (4 diffs)

src/main/java/project/fmo/app/projcetfmo/Model/Dostava.java

@@ -1 @@
-package model;
+package project.fmo.app.projcetfmo.Model;
 
-import jakarta.persistence.*;
+import project.fmo.app.projcetfmo.Service.impl.DostavaServiceImpl;
+
+import javax.persistence.*;
 
 import java.sql.Date;
@@ -7 +9 @@
 
 @Entity
+@Table(schema = "project", name = "dostava",  catalog = "db_202223z_va_prj_fmo")
 public class Dostava {
-    @Basic
-    @Column(name = "id_korisnik")
-    private int idKorisnik;
-    @Basic
-    @Column(name = "id_naracka")
-    private int idNaracka;
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @ManyToOne
+    @JoinColumn(name = "id_korisnik")
+    private Dostavuvac dostavuvac;
+    @OneToOne
+    @JoinColumn(name = "id_naracka")
+    private Naracka naracka;
     @Id
     @Column(name = "id_dostava")
@@ -25 +27 @@
     private String status;
 
+    public Dostava (){}
+
+    public Dostava(Dostavuvac dostavuvac, Naracka naracka, int idDostava, Date datum, String status) {
+        this.dostavuvac = dostavuvac;
+        this.naracka = naracka;
+        this.idDostava = idDostava;
+        this.datum = datum;
+        this.status = status;
+    }
+
     public int getIdKorisnik() {
-        return idKorisnik;
+        return dostavuvac.getIdKorisnik();
     }
 
     public void setIdKorisnik(int idKorisnik) {
-        this.idKorisnik = idKorisnik;
+        this.dostavuvac.setIdKorisnik(idKorisnik);
     }
 
     public int getIdNaracka() {
-        return idNaracka;
+        return naracka.getIdNaracka();
     }
 
     public void setIdNaracka(int idNaracka) {
-        this.idNaracka = idNaracka;
+        this.naracka.setIdNaracka(idNaracka);
     }
 
@@ -70 +82 @@
         if (o == null || getClass() != o.getClass()) return false;
         Dostava dostava = (Dostava) o;
-        return idKorisnik == dostava.idKorisnik && idNaracka == dostava.idNaracka && idDostava == dostava.idDostava && Objects.equals(datum, dostava.datum) && Objects.equals(status, dostava.status);
+        return dostavuvac == dostava.dostavuvac && naracka == dostava.naracka && idDostava == dostava.idDostava && Objects.equals(datum, dostava.datum) && Objects.equals(status, dostava.status);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(idKorisnik, idNaracka, idDostava, datum, status);
+        return Objects.hash(dostavuvac, naracka, idDostava, datum, status);
     }
 }