Changeset a226bc3

Timestamp:

02/04/24 17:48:29 (5 months ago)

Author:

Blazho <aleksandar.blazhevski@…>

Branches:

master

Parents:

ee27685

Message:

Vraboteniot ja planira dostavata na narackata(https://develop.finki.ukim.mk/projects/cbdb/wiki/useCase10)

Location:

src/main

Files:

• java/com/example/cookbook/controller/VrabotenController.java (modified) (3 diffs)
• java/com/example/cookbook/model/DostavaDTO.java (modified) (1 diff)
• 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) (2 diffs)
• resources/templates/naracki.html (modified) (1 diff)
• resources/templates/stavka.html (modified) (2 diffs)

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

@@ -2 +2 @@
 
 
+import com.example.cookbook.model.DostavaDTO;
 import com.example.cookbook.model.Naracka;
 import com.example.cookbook.model.Recept;
@@ -43 +44 @@
                                  @RequestParam LocalDateTime vreme,
                                  Model model){
-
+        List<DostavaDTO> podatoci = null;
         List<Stavka> stavkiVoNaracka = null;
         try {
             stavkiVoNaracka = narcakiService.findByTelAndVreme(telefon, vreme);
+            podatoci = narcakiService.findDataForDostava(telefon, vreme);
         } catch (SQLException e) {
             return "redirect:/error-page/SQL%20Exception";
@@ -52 +54 @@
 
         model.addAttribute("stavki", stavkiVoNaracka);
+        model.addAttribute("podatoci", podatoci);
 
         return "stavka";

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

@@ -3 +3 @@
 import java.time.LocalDateTime;
 
-public record DostavaDTO (String recIme, String adresa, String sostojka, LocalDateTime vreme, String telefon){
-    public DostavaDTO(String recIme, String adresa, String sostojka, LocalDateTime vreme, String telefon) {
+public record DostavaDTO (String recIme, String adresa, String sostojka){
+    public DostavaDTO(String recIme, String adresa, String sostojka) {
         this.recIme = recIme;
         this.adresa = adresa;
         this.sostojka = sostojka;
-        this.vreme = vreme;
-        this.telefon = telefon;
     }
 }

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

@@ -3 +3 @@
 
 import com.example.cookbook.dbConfig.DB;
+import com.example.cookbook.model.DostavaDTO;
 import com.example.cookbook.model.Naracka;
 import com.example.cookbook.model.Recept;
@@ -65 +66 @@
         return stavki;
     }
+
+    public List<DostavaDTO> findDataForDostava(String telefon, LocalDateTime vreme) throws SQLException {
+        Connection connection = DB.getConnection();
+        String query = "select r.rec_ime, l.adresa, 'Готово' sostojka from so_koi sk\n" +
+                "            left join recepti r on\n" +
+                "                        r.rec_id = sk.rec_id\n" +
+                "                left join opsluzuva o on\n" +
+                "                        o.rec_id = r.rec_id\n" +
+                "                left join restorani r2 on\n" +
+                "                        r2.res_id = o.res_id\n" +
+                "                left join se_naogja1 sn on\n" +
+                "                        sn.res_id = r2.res_id\n" +
+                "                left join lokacii l on\n" +
+                "                        l.l_id = sn.l_id\n" +
+                "        where vreme = ? and telefon = ? and sk.nacin = 'Готово'\n" +
+                "union\n" +
+                "select r.rec_ime, l.adresa, s2.s_naziv sostojka  from so_koi sk\n" +
+                "        left join recepti r on\n" +
+                "                        r.rec_id = sk.rec_id\n" +
+                "                left join sodrzi s on\n" +
+                "                        r.rec_id = s.rec_id\n" +
+                "                left join sostojki s2 on\n" +
+                "                        s2.s_id = s.s_id\n" +
+                "                left join ja_ima ji on\n" +
+                "                        ji.s_id = s2.s_id\n" +
+                "                left join prodavnici p on\n" +
+                "                        p.pro_id = ji.pro_id\n" +
+                "                left join se_naogja2 sn on\n" +
+                "                        sn.pro_id = p.pro_id\n" +
+                "                left join lokacii l on\n" +
+                "                        l.l_id = sn.l_id\n" +
+                "        where vreme = ? and telefon = ? and sk.nacin = 'Состојки'";
+        PreparedStatement prepStm = connection.prepareStatement(query);
+
+        prepStm.setObject(1, vreme);
+        prepStm.setString(2, telefon);
+        prepStm.setObject(3, vreme);
+        prepStm.setString(4, telefon);
+
+        ResultSet result = prepStm.executeQuery();
+
+        List<DostavaDTO> dostavaDTOS = new ArrayList<>();
+        while (result.next()){
+            DostavaDTO stavka = new DostavaDTO(
+                    result.getString("rec_ime"),
+                    result.getString("adresa"),
+                    result.getString("sostojka")
+            );
+
+            dostavaDTOS.add(stavka);
+        }
+        DB.closeConnection();
+        result.close();
+        prepStm.close();
+        return dostavaDTOS;
+    }
 }

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

@@ -1 +1 @@
 package com.example.cookbook.service;
 
+import com.example.cookbook.model.DostavaDTO;
 import com.example.cookbook.model.Naracka;
 import com.example.cookbook.model.Recept;
@@ -14 +15 @@
 
     List<Stavka> findByTelAndVreme(String telefon, LocalDateTime vreme) throws SQLException;
+
+    List<DostavaDTO> findDataForDostava(String telefon, LocalDateTime vreme) throws SQLException;
 }

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

@@ -2 +2 @@
 
 
+import com.example.cookbook.model.DostavaDTO;
 import com.example.cookbook.model.Naracka;
 import com.example.cookbook.model.Recept;
@@ -31 +32 @@
         return narackiRepository.findByTelAndVreme(telefon, vreme);
     }
+
+    @Override
+    public List<DostavaDTO> findDataForDostava(String telefon, LocalDateTime vreme) throws SQLException {
+        return narackiRepository.findDataForDostava(telefon, vreme);
+    }
 }

src/main/resources/templates/naracki.html

@@ -20 +20 @@
         <ul class="navbar-nav ml-auto">
             <li class="nav-item active">
-                <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>
+                <a class="nav-link" th:href="@{/}">Home <span class="sr-only">(current)</span></a>
             </li>
             <li class="nav-item">

src/main/resources/templates/stavka.html

@@ -20 +20 @@
     <ul class="navbar-nav ml-auto">
       <li class="nav-item active">
-        <a class="nav-link" href="#">Home <span class="sr-only">(current)</span></a>
+        <a class="nav-link" th:href="@{/}">Home <span class="sr-only">(current)</span></a>
       </li>
       <li class="nav-item">
@@ -52 +52 @@
       <td th:text="${stavka.nacin}"></td>
       <td>
-        <button class="btn btn-primary">View</button>
+        <button class="btn btn-primary" disabled>View</button>
         <button class="btn btn-danger" disabled>Delete</button>
       </td>
     </tr>
+    </tbody>
+  </table>
+
+  <h3>Information for the items of the order</h3>
+  <table class="table">
+    <thead>
+      <tr>
+        <th>Ime recept</th>
+        <th>Adresa</th>
+        <th>Sostojka</th>
+        <th>Action</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr th:each="dostava: ${podatoci}">
+        <td th:text="${dostava.recIme()}"></td>
+        <td th:text="${dostava.adresa()}"></td>
+        <td th:text="${dostava.sostojka()}"></td>
+        <td>
+          <button class="btn btn-primary">Select</button>
+        </td>
+      </tr>
     </tbody>
   </table>