slike i lokacija repository - ubacene procedure

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

@@ -4,6 +4,7 @@ import com.example.SkuciSe.model.lokacija.Lokacija;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
+import java.sql.CallableStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.ArrayList;
@@ -17,11 +18,13 @@ public class LokacijaRepository
 
 
     public List<Lokacija> findAll()
     public List<Lokacija> findAll()
     {
     {
-        String sql = "select * from lokacija";
+        String sql = "{call findAllLokacija()}";
         List<Lokacija> list = new ArrayList<Lokacija>();
         List<Lokacija> list = new ArrayList<Lokacija>();
+        CallableStatement stmt = null;
         ResultSet rs = null;
         ResultSet rs = null;
         try {
         try {
-            rs = dataBase.statement.executeQuery( sql);
+            stmt = dataBase.connection.prepareCall( sql);
+            rs = stmt.executeQuery();
             while( rs.next())
             while( rs.next())
             {
             {
                 list.add( new Lokacija( rs.getInt("lokacijaid"), rs.getString("naziv")));
                 list.add( new Lokacija( rs.getInt("lokacijaid"), rs.getString("naziv")));
@@ -35,10 +38,13 @@ public class LokacijaRepository
 
 
     public Lokacija findById(int lokacijaId)
     public Lokacija findById(int lokacijaId)
     {
     {
-        String sql = "select * from lokacija where lokacijaid = " + lokacijaId;
+        String sql = "{ call findLokacijaById(?)}";
+        CallableStatement stmt = null;
         ResultSet rs = null;
         ResultSet rs = null;
         try {
         try {
-            rs = dataBase.statement.executeQuery( sql);
+            stmt = dataBase.connection.prepareCall( sql);
+            stmt.setInt(1, lokacijaId);
+            rs = stmt.executeQuery();
             while( rs.next())
             while( rs.next())
             {
             {
                 return new Lokacija( rs.getInt("lokacijaid"), rs.getString("naziv"));
                 return new Lokacija( rs.getInt("lokacijaid"), rs.getString("naziv"));

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

@@ -5,6 +5,7 @@ import com.example.SkuciSe.model.slika.Slika;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
+import java.sql.CallableStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.ArrayList;
@@ -19,10 +20,13 @@ public class SlikeRepository
     public List<Slika> findAllById( int oglasId)
     public List<Slika> findAllById( int oglasId)
     {
     {
         List<Slika> list = new ArrayList<Slika>();
         List<Slika> list = new ArrayList<Slika>();
-        String sql = "select * from slike where oglasid = " + oglasId;
+        String sql = "{ call findAllSlikeByOglasId(?)}";
         ResultSet rs = null;
         ResultSet rs = null;
+        CallableStatement stmt = null;
         try {
         try {
-            rs = dataBase.statement.executeQuery( sql);
+            stmt = dataBase.connection.prepareCall( sql);
+            stmt.setInt( 1, oglasId);
+            rs = stmt.executeQuery();
             while( rs.next())
             while( rs.next())
             {
             {
                 list.add( new Slika( rs.getInt("slikeId"), rs.getInt("oglasid"), rs.getString("slika") ));
                 list.add( new Slika( rs.getInt("slikeId"), rs.getInt("oglasid"), rs.getString("slika") ));
@@ -30,7 +34,6 @@ public class SlikeRepository
         } catch (SQLException e) {
         } catch (SQLException e) {
             throw new RuntimeException(e);
             throw new RuntimeException(e);
         }
         }
-
         return list;
         return list;
     }
     }
 
 
@@ -39,10 +42,13 @@ public class SlikeRepository
         List<Slika> list = new ArrayList<Slika>();
         List<Slika> list = new ArrayList<Slika>();
         for( Oglas oglas: oglasi)
         for( Oglas oglas: oglasi)
         {
         {
-            String sql = "select * from slike where oglasid = " + oglas.getOglasId();
+            CallableStatement stmt = null;
+            String sql = "{call findAllOglasFirstPics(?)}";
             ResultSet rs = null;
             ResultSet rs = null;
             try {
             try {
-                rs = dataBase.statement.executeQuery( sql);
+                stmt = dataBase.connection.prepareCall( sql);
+                stmt.setInt(1, oglas.getOglasId());
+                rs = stmt.executeQuery();
                 while( rs.next())
                 while( rs.next())
                 {
                 {
                     list.add( new Slika( rs.getInt("slikeid"), rs.getInt("oglasid"), rs.getString("slika")));
                     list.add( new Slika( rs.getInt("slikeid"), rs.getInt("oglasid"), rs.getString("slika")));