Changeset ee27685

Timestamp:

02/04/24 17:12:57 (5 months ago)

Author:

Blazho <aleksandar.blazhevski@…>

Branches:

master

Children:

a226bc3

Parents:

cab1b7d

Message:

Added order items page

Location:

src/main

Files:

• java/com/example/cookbook/controller/VrabotenController.java (modified) (2 diffs)
• java/com/example/cookbook/model/Komentar.java (modified) (1 diff)
• java/com/example/cookbook/model/Stavka.java (added)
• java/com/example/cookbook/repository/NarackiRepository.java (modified) (2 diffs)
• java/com/example/cookbook/service/NarackiService.java (modified) (2 diffs)
• java/com/example/cookbook/service/impl/NarackiServiceImpl.java (modified) (3 diffs)
• resources/templates/naracki.html (modified) (1 diff)
• resources/templates/stavka.html (added)

src/main/java/com/example/cookbook/controller/VrabotenController.java

@@ -3 +3 @@
 
 import com.example.cookbook.model.Naracka;
+import com.example.cookbook.model.Recept;
+import com.example.cookbook.model.Stavka;
 import com.example.cookbook.service.NarackiService;
 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.RequestParam;
 
 import java.sql.SQLException;
+import java.time.LocalDateTime;
 import java.util.List;
 
@@ -33 +38 @@
         return "naracki";
     }
+
+    @GetMapping("/naracki/naracka")
+    public String getNarackaPage(@RequestParam String telefon,
+                                 @RequestParam LocalDateTime vreme,
+                                 Model model){
+
+        List<Stavka> stavkiVoNaracka = null;
+        try {
+            stavkiVoNaracka = narcakiService.findByTelAndVreme(telefon, vreme);
+        } catch (SQLException e) {
+            return "redirect:/error-page/SQL%20Exception";
+        }
+
+        model.addAttribute("stavki", stavkiVoNaracka);
+
+        return "stavka";
+    }
 }

src/main/java/com/example/cookbook/model/Komentar.java

@@ -87 +87 @@
 
     public String getDataFormatirana(){
-        return komData.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
+        return komData.format(DateTimeFormatter.ofPattern("yyyy-MMM-dd HH:mm"));
     }
 }

src/main/java/com/example/cookbook/repository/NarackiRepository.java

@@ -4 +4 @@
 import com.example.cookbook.dbConfig.DB;
 import com.example.cookbook.model.Naracka;
+import com.example.cookbook.model.Recept;
+import com.example.cookbook.model.Stavka;
 import org.springframework.stereotype.Repository;
 
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
+import java.sql.*;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -39 +38 @@
         return naracki;
     }
+
+    public List<Stavka> findByTelAndVreme(String telefon, LocalDateTime vreme) throws SQLException {
+
+        Connection connection = DB.getConnection();
+        String query = "select sk.vreme, sk.telefon, r.rec_ime, nacin from so_koi sk\n" +
+                "        left join recepti r on r.rec_id = sk.rec_id\n" +
+                "where vreme = ? and telefon = ?;";
+        PreparedStatement prepStm = connection.prepareStatement(query);
+
+        prepStm.setObject(1, vreme);
+        prepStm.setString(2, telefon);
+
+        ResultSet result = prepStm.executeQuery();
+        List<Stavka> stavki = new ArrayList<>();
+        while (result.next()){
+            Stavka stavka = new Stavka();
+            stavka.setRecIme(result.getString("rec_ime"));
+            stavka.setTelefon(result.getString("telefon"));
+            stavka.setNacin(result.getString("nacin"));
+            stavka.setVreme(result.getObject("vreme", LocalDateTime.class));
+            stavki.add(stavka);
+        }
+        DB.closeConnection();
+        result.close();
+        prepStm.close();
+        return stavki;
+    }
 }

src/main/java/com/example/cookbook/service/NarackiService.java

@@ -2 +2 @@
 
 import com.example.cookbook.model.Naracka;
+import com.example.cookbook.model.Recept;
+import com.example.cookbook.model.Stavka;
 
 import java.sql.SQLException;
+import java.time.LocalDateTime;
 import java.util.List;
 
@@ -9 +12 @@
 
     List<Naracka> listAll() throws SQLException;
+
+    List<Stavka> findByTelAndVreme(String telefon, LocalDateTime vreme) throws SQLException;
 }

src/main/java/com/example/cookbook/service/impl/NarackiServiceImpl.java

@@ -3 +3 @@
 
 import com.example.cookbook.model.Naracka;
+import com.example.cookbook.model.Recept;
+import com.example.cookbook.model.Stavka;
 import com.example.cookbook.repository.NarackiRepository;
 import com.example.cookbook.service.NarackiService;
@@ -8 +10 @@
 
 import java.sql.SQLException;
+import java.time.LocalDateTime;
 import java.util.List;
 
@@ -23 +26 @@
         return narackiRepository.findAll();
     }
+
+    @Override
+    public List<Stavka> findByTelAndVreme(String telefon, LocalDateTime vreme) throws SQLException {
+        return narackiRepository.findByTelAndVreme(telefon, vreme);
+    }
 }

src/main/resources/templates/naracki.html

@@ -48 +48 @@
             <td th:text="${naracka.telefon}"></td>
             <td>
-                <form th:method="POST" th:action="@{/naracki/naracka}">
+                <form th:method="GET" th:action="@{/naracki/naracka}">
                     <input type="datetime-local" hidden th:value="${naracka.vreme}" th:name="vreme">
                     <input type="text" hidden th:value="${naracka.telefon}" th:name="telefon">