Changeset d4d8fb9 for src

Timestamp:

02/03/24 18:08:44 (9 months ago)

Author:

Blazho <aleksandar.blazhevski@…>

Branches:

master

Children:

cab1b7d

Parents:

aea04dd

Message:

Posetitelot komentira i dava ocena za recept(https://develop.finki.ukim.mk/projects/cbdb/wiki/useCase11)

Location:

src/main

Files:

• java/com/example/cookbook/controller/HomeController.java (modified) (6 diffs)
• java/com/example/cookbook/model/Komentar.java (modified) (1 diff)
• java/com/example/cookbook/model/Korisnik.java (added)
• java/com/example/cookbook/model/TipKorisnik.java (added)
• java/com/example/cookbook/repository/KomentariRepository.java (modified) (2 diffs)
• java/com/example/cookbook/repository/KorisniciRepository.java (added)
• java/com/example/cookbook/service/KomentariService.java (modified) (1 diff)
• java/com/example/cookbook/service/KorisniciService.java (added)
• java/com/example/cookbook/service/impl/KomentariServiceImpl.java (modified) (2 diffs)
• java/com/example/cookbook/service/impl/KorisniciServiceImpl.java (added)
• resources/templates/recept.html (modified) (1 diff)

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

@@ -2 +2 @@
 
 
-import com.example.cookbook.model.Komentar;
-import com.example.cookbook.model.Recept;
-import com.example.cookbook.model.Slika;
-import com.example.cookbook.model.Sostojka;
+import com.example.cookbook.model.*;
 import com.example.cookbook.model.exception.ReceptNeEPronajdenException;
-import com.example.cookbook.service.KomentariService;
-import com.example.cookbook.service.ReceptService;
-import com.example.cookbook.service.SlikiService;
-import com.example.cookbook.service.SostojkiService;
+import com.example.cookbook.service.*;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+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;
 
@@ -29 +26 @@
     private final KomentariService komentariService;
 
+    private final KorisniciService korisniciService;
+
     public HomeController(ReceptService receptService,
                           SlikiService slikiService,
-                          SostojkiService sostojkiService, KomentariService komentariService) {
+                          SostojkiService sostojkiService, KomentariService komentariService, KorisniciService korisniciService) {
 
         this.receptService = receptService;
@@ -37 +36 @@
         this.sostojkiService = sostojkiService;
         this.komentariService = komentariService;
+        this.korisniciService = korisniciService;
     }
 
@@ -59 +59 @@
         List<Sostojka> sostojki;
         List<Komentar> komentari;
+        List<Korisnik> posetiteli;
         try {
             recept = receptService.findById(id);
@@ -64 +65 @@
             sostojki = sostojkiService.findAllById(id);
             komentari = komentariService.findAllById(id);
+            posetiteli = korisniciService.findAllByRole(TipKorisnik.Posetitel);
         } catch (SQLException e) {
             return "redirect:/error-page/SQL%20Exception";
@@ -73 +75 @@
         model.addAttribute("sostojki", sostojki);
         model.addAttribute("komentari", komentari);
+        model.addAttribute("posetiteli", posetiteli);
         return "recept";
+    }
+
+    @PostMapping("/komentar/{id}")
+    public String processKomentar(@PathVariable Long id,
+                                  @RequestParam Integer ocena,
+                                  @RequestParam String komentar,
+                                  @RequestParam String telefon){
+        if (id == null){
+            return "redirect:/error-page/Ne%20dodavanje%20komentar(Identifikatorot%20na%20receptot%20ne%20postoi)";
+        }
+        try {
+            komentariService.add(telefon, id, ocena, komentar);
+        } catch (SQLException e) {
+            return "redirect:/error-page/SQL%20Exception";
+        }catch (IllegalArgumentException e){
+            return "redirect:/error-page/Illegal%20Arguments";
+        }
+        return "redirect:/recept/" + id;
     }
 

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

@@ -24 +24 @@
     public void setImePrezime(String imePrezime) {
         this.imePrezime = imePrezime;
+    }
+
+    public Komentar(LocalDateTime komData, String telefon, Long recId, Integer ocena, String text) {
+        this.komData = komData;
+        this.telefon = telefon;
+        this.recId = recId;
+        this.ocena = ocena;
+        this.text = text;
     }
 

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

@@ -6 +6 @@
 import org.springframework.stereotype.Repository;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
+import java.sql.*;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -48 +45 @@
         return komentari;
     }
+
+    public void save(Komentar komentar) throws SQLException {
+        Connection connection = DB.getConnection();
+
+        String query = "insert into komentari (kom_data, telefon, rec_id, ocena, text) values \n" +
+                "        (?, ?, ?, ?, ?);";
+
+        PreparedStatement prepStm = connection.prepareStatement(query);
+        prepStm.setObject(1, komentar.getKomData());
+        prepStm.setString(2, komentar.getTelefon());
+        prepStm.setLong(3, komentar.getRecId());
+        prepStm.setInt(4, komentar.getOcena());
+        prepStm.setString(5, komentar.getText());
+
+        prepStm.executeUpdate();
+
+        prepStm.close();
+        DB.closeConnection();
+    }
 }

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

@@ -9 +9 @@
 
     List<Komentar> findAllById(Long recId) throws SQLException;
+
+    void add(String telefon, Long id, Integer ocena, String komentar) throws SQLException;
 }

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

@@ -8 +8 @@
 
 import java.sql.SQLException;
+import java.time.LocalDateTime;
 import java.util.List;
 
@@ -23 +24 @@
         return komentariRepository.findAllByRecId(recId);
     }
+
+    @Override
+    public void add(String telefon, Long id, Integer ocena, String komentar) throws SQLException {
+        if (telefon.isBlank() || ocena == null){
+            throw new IllegalArgumentException();
+        }
+        komentariRepository.save(new Komentar(LocalDateTime.now(), telefon, id, ocena, komentar));
+    }
 }

src/main/resources/templates/recept.html

@@ -83 +83 @@
                 <select id="telefon" name="telefon" required>
                     <option selected></option>
-                    <option th:each="tel : ${telefoni}" th:text="tel" th:value="tel"></option>
+                    <option th:each="posetitel : ${posetiteli}"
+                            th:text="${posetitel.telefon}"
+                            th:value="${posetitel.telefon}"></option>
                 </select>
             </div>