Merge remote-tracking branch 'origin/master'

SkuciSe/src/main/java/com/example/SkuciSe/controller/OglasController.java

@@ -71,7 +71,7 @@ public class OglasController
         }
         model.addAttribute("oglasi",listaOglasa);
         List<String> list = new ArrayList<String>();
-        for (Oglas o:oRepo.findAll()) {
+        for (Oglas o:listaOglasa) {
             list.add(kRepo.findCity(o.getLokacijaId()));
         }
         model.addAttribute("gradovi",list);
@@ -114,6 +114,8 @@ public class OglasController
             list.add(kRepo.findCity(o.getLokacijaId()));
         }
         model.addAttribute("gradovi",list);
-        return "/lista-oglasa";
+        model.addAttribute("lokacije", lRepo.findAll());
+        model.addAttribute("slikeOglasa", sRepo.findAllFirstPics(listaOglasa));
+        return "lista-oglasa";
     }
 }

SkuciSe/src/main/java/com/example/SkuciSe/model/termin/Termin.java

+package com.example.SkuciSe.model.termin;
+
+import lombok.*;
+
+import java.sql.*;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
+public class Termin
+{
+        int terminId;
+        int korisnikId;
+        int oglasId;
+        Date datum;
+        Time vreme;
+        String status;
+}

SkuciSe/src/main/java/com/example/SkuciSe/repository/KorisnikRepository.java

@@ -36,8 +36,7 @@ public class KorisnikRepository
                      stmt.setInt(6,1);
                      stmt.setString(7,slika);
                      stmt.setInt(8,korisnik.getGradId());
-                     stmt.addBatch();
-                     stmt.executeBatch();
+                     stmt.execute();
              } catch (IOException e) {
                  System.out.println(e.getMessage());
              } catch (SQLException e) {
@@ -62,7 +61,6 @@ public class KorisnikRepository
             stmt.setString(4,korisnik.getTelefon());
             stmt.setInt(5,korisnik.getGradId());
             stmt.setInt(6,korisnik.getKorisnikId());
-            System.out.println(stmt.toString());
             stmt.execute();
         }
         catch (SQLException e) {
@@ -208,7 +206,7 @@ public class KorisnikRepository
 
     public void enableKorisnik( int korisnikId)
     {
-        String sql = "call enableKorisnik(?)";
+        String sql = "{call enableKorisnik(?)}";
         CallableStatement stmt = null;
         try {
             stmt = dataBase.connection.prepareCall(sql);

SkuciSe/src/main/java/com/example/SkuciSe/repository/OglasRepository.java

@@ -59,30 +59,15 @@ public class OglasRepository
 
     }
 
-    public List<Oglas> findAll( )
-    {
-        List<Oglas> list = new ArrayList<Oglas>();
-        String sql = "select * from oglas";
-        ResultSet rs = null;
-        try {
-            rs = dataBase.statement.executeQuery( sql);
-            while( rs.next())
-            {
-                Oglas oglas =  new Oglas( rs.getInt("oglasId"), rs.getInt("korisnikId"), rs.getString("naslov"),rs.getString("opis"),rs.getInt("lokacijaId"),rs.getDouble("cena"),rs.getInt("vrstaOglasaId"),rs.getDouble("kvadratura"),rs.getInt("brojSoba"),rs.getBoolean("namesten"),rs.getBoolean("grejanje"),rs.getBoolean("lift"),rs.getString("lokacija"));
-                list.add( oglas);
-            }
-        } catch (SQLException e) {
-            throw new RuntimeException(e);
-        }
-        return( list);
-    }
-
     public Oglas findById(int oglasId)
     {
-        String sql = "select * from oglas where oglasid = " + oglasId;
+        String sql = "{ call findOglasbyId(?)}";
+        CallableStatement stmt = null;
         ResultSet rs = null;
         try {
-            rs = dataBase.statement.executeQuery( sql);
+            stmt = dataBase.connection.prepareCall( sql);
+            stmt.setInt( 1, oglasId);
+            rs = stmt.executeQuery();
             while( rs.next())
             {
                 Oglas oglas = new Oglas( rs.getInt("oglasId"), rs.getInt("korisnikId"), rs.getString("naslov"),rs.getString("opis"),rs.getInt("lokacijaId"),rs.getDouble("cena"),rs.getInt("vrstaOglasaId"),rs.getDouble("kvadratura"),rs.getInt("brojSoba"),rs.getBoolean("namesten"),rs.getBoolean("grejanje"),rs.getBoolean("lift"),rs.getString("lokacija"));
@@ -94,30 +79,15 @@ public class OglasRepository
         return( null);
     }
 
-    public List<Oglas> findAllByKorisnikId( int korisnikId)
-    {
-        List<Oglas> list = new ArrayList<Oglas>();
-        String sql = "select * from oglas where korisnikid = " + korisnikId;
-        ResultSet rs = null;
-        try {
-            rs = dataBase.statement.executeQuery( sql);
-            while( rs.next())
-            {
-                Oglas oglas =  new Oglas( rs.getInt("oglasId"), rs.getInt("korisnikId"), rs.getString("naslov"),rs.getString("opis"),rs.getInt("lokacijaId"),rs.getDouble("cena"),rs.getInt("vrstaOglasaId"),rs.getDouble("kvadratura"),rs.getInt("brojSoba"),rs.getBoolean("namesten"),rs.getBoolean("grejanje"),rs.getBoolean("lift"),rs.getString("lokacija"));
-                list.add( oglas);
-            }
-        } catch (SQLException e) {
-            throw new RuntimeException(e);
-        }
-        return( list);
-    }
-
     public void deleteOglasi(Integer id)
     {
-        String sql = "select * from oglas where korisnikid = " + id;
+        String sql = "{call findAllByKorisnikId(?)}";
+        CallableStatement stmt = null;
         ResultSet rs = null;
         try {
-            rs = dataBase.statement.executeQuery( sql);
+            stmt = dataBase.connection.prepareCall( sql);
+            stmt.setInt(1,id);
+            rs = stmt.executeQuery();
             while( rs.next())
             {
                 int oglasid = rs.getInt("oglasid");
@@ -127,18 +97,24 @@ public class OglasRepository
             throw new RuntimeException(e);
         }
 
-        sql = "delete from oglas where KorisnikId = "+id;
+        sql = "{call deleteOglasiByKorisnikId(?)}";
+        CallableStatement stmt1 = null;
         try {
-            dataBase.statement.execute(sql);
+            stmt1 = dataBase.connection.prepareCall( sql);
+            stmt1.setInt(1, id);
+            stmt1.execute();
         } catch (SQLException e) {
             throw new RuntimeException(e);
         }
     }
     public void deleteSlike(Integer id)
     {
-        String sql = "delete from slike where oglasid = "+id;
+        String sql = "{call deleteSlike(?)}";
+        CallableStatement cs = null;
         try {
-            dataBase.statement.execute(sql);
+            cs = dataBase.connection.prepareCall(sql);
+            cs.setInt(1, id);
+            cs.execute();
         } catch (SQLException e) {
             throw new RuntimeException(e);
         }
@@ -147,10 +123,12 @@ public class OglasRepository
     public List<Oglas> findAll(Integer vrstaOglasaId, Integer lokacijaId, Integer brojSoba, Double cenaMin, Double cenaMax, Double kvadraturaMin, Double kvadraturaMax, Boolean lift, Boolean grejanje, Boolean namesten)
     {
         List<Oglas> list = new ArrayList<Oglas>();
-        String sql = "select * from oglas";
+        String sql = "{call findAll()}";
         ResultSet rs = null;
+        CallableStatement stmt = null;
         try {
-            rs = dataBase.statement.executeQuery( sql);
+            stmt = dataBase.connection.prepareCall(sql);
+            rs = stmt.executeQuery();
             while( rs.next())
             {
                 Oglas oglas =  new Oglas( rs.getInt("oglasId"), rs.getInt("korisnikId"), rs.getString("naslov"),rs.getString("opis"),rs.getInt("lokacijaId"),rs.getDouble("cena"),rs.getInt("vrstaOglasaId"),rs.getDouble("kvadratura"),rs.getInt("brojSoba"),rs.getBoolean("namesten"),rs.getBoolean("grejanje"),rs.getBoolean("lift"),rs.getString("lokacija"));
@@ -181,10 +159,13 @@ public class OglasRepository
     public List<Oglas> findAllByKorisnikId(int korisnikId, Integer vrstaOglasaId, Integer lokacijaId, Integer brojSoba, Double cenaMin, Double cenaMax, Double kvadraturaMin, Double kvadraturaMax, Boolean lift, Boolean grejanje, Boolean namesten)
     {
         List<Oglas> list = new ArrayList<Oglas>();
-        String sql = "select * from oglas where korisnikid = " + korisnikId;
+        String sql = "{call findAllByKorisnikId(?)}";
         ResultSet rs = null;
+        CallableStatement stmt = null;
         try {
-            rs = dataBase.statement.executeQuery( sql);
+            stmt = dataBase.connection.prepareCall(sql);
+            stmt.setInt(1,korisnikId);
+            rs = stmt.executeQuery();
             while( rs.next())
             {
                 Oglas oglas =  new Oglas( rs.getInt("oglasId"), rs.getInt("korisnikId"), rs.getString("naslov"),rs.getString("opis"),rs.getInt("lokacijaId"),rs.getDouble("cena"),rs.getInt("vrstaOglasaId"),rs.getDouble("kvadratura"),rs.getInt("brojSoba"),rs.getBoolean("namesten"),rs.getBoolean("grejanje"),rs.getBoolean("lift"),rs.getString("lokacija"));