Skip to content

S
SkuciSe
Commit 8a8ee3c3 by Bogdan Andjelkovic
Options

mala ispravka lajkovana - back

parent 64b58b16
Showing with 38 additions and 37 deletions
SkuciSe/src/main/java/com/example/SkuciSe/controller/OglasController.java
...@@ -60,38 +60,6 @@ public class OglasController ...@@ -60,38 +60,6 @@ public class OglasController
return("redirect:/lista-oglasa/"+oglasId); return("redirect:/lista-oglasa/"+oglasId);
} }
@GetMapping("/lista-oglasa")
public String getListaOglasa( Model model,
@AuthenticationPrincipal KorisnikDetails loggedUser,
@RequestParam(value = "vrstaOglasaId", required=false) Integer vrstaOglasaId,
@RequestParam(value = "lokacijaId", required=false) Integer lokacijaId,
@RequestParam(value = "cenaMin", required=false) Double cenaMin,
@RequestParam(value = "cenaMax", required=false) Double cenaMax,
@RequestParam(value = "brojSoba", required=false) Integer brojSoba,
@RequestParam(value = "kvadraturaMin", required=false) Double kvadraturaMin,
@RequestParam(value = "kvadraturaMax", required=false) Double kvadraturaMax,
@RequestParam(value = "lift", required=false) Boolean lift,
@RequestParam(value = "grejanje", required=false) Boolean grejanje,
@RequestParam(value = "namesten", required=false) Boolean namesten,
@RequestParam(value = "pretraga", required=false) String pretraga)
{
model.addAttribute("loggedUser", loggedUser);
List<Oglas> listaOglasa = oRepo.findAll( vrstaOglasaId, lokacijaId, brojSoba, cenaMin, cenaMax, kvadraturaMin,kvadraturaMax, lift, grejanje, namesten, pretraga);
while(listaOglasa.size() % 3 != 0){
Oglas o = new Oglas();
listaOglasa.add(o);
}
model.addAttribute("oglasi",listaOglasa);
List<String> list = new ArrayList<String>();
for (Oglas o:listaOglasa) {
list.add(kRepo.findCity(o.getLokacijaId()));
}
model.addAttribute("gradovi",list);
model.addAttribute("lokacije", lRepo.findAll());
model.addAttribute("slikeOglasa", sRepo.findAllFirstPics(listaOglasa));
return "/lista-oglasa";
}
@GetMapping("/lista-oglasa/{oglasId}") @GetMapping("/lista-oglasa/{oglasId}")
public String getOglas(Model model, @PathVariable("oglasId") int oglasId, @AuthenticationPrincipal KorisnikDetails loggedUser) public String getOglas(Model model, @PathVariable("oglasId") int oglasId, @AuthenticationPrincipal KorisnikDetails loggedUser)
{ {
...@@ -119,13 +87,46 @@ public class OglasController ...@@ -119,13 +87,46 @@ public class OglasController
} }
model.addAttribute("korisniciKomentari", korisniciKomentari); model.addAttribute("korisniciKomentari", korisniciKomentari);
model.addAttribute("likesCount", lajkRepo.countLajks(oglasId));
if( loggedUser!=null) if( loggedUser!=null)
{ {
model.addAttribute("liked", lajkRepo.isLiked( new Lajk(oglasId, loggedUser.getKorisnik().getKorisnikId()))); model.addAttribute("liked", lajkRepo.isLiked( new Lajk(oglasId, loggedUser.getKorisnik().getKorisnikId())));
model.addAttribute("likesCount", lajkRepo.countLajks(oglasId));
} }
return("oglas"); return("oglas");
} }
@GetMapping("/lista-oglasa")
public String getListaOglasa( Model model,
@AuthenticationPrincipal KorisnikDetails loggedUser,
@RequestParam(value = "vrstaOglasaId", required=false) Integer vrstaOglasaId,
@RequestParam(value = "lokacijaId", required=false) Integer lokacijaId,
@RequestParam(value = "cenaMin", required=false) Double cenaMin,
@RequestParam(value = "cenaMax", required=false) Double cenaMax,
@RequestParam(value = "brojSoba", required=false) Integer brojSoba,
@RequestParam(value = "kvadraturaMin", required=false) Double kvadraturaMin,
@RequestParam(value = "kvadraturaMax", required=false) Double kvadraturaMax,
@RequestParam(value = "lift", required=false) Boolean lift,
@RequestParam(value = "grejanje", required=false) Boolean grejanje,
@RequestParam(value = "namesten", required=false) Boolean namesten,
@RequestParam(value = "pretraga", required=false) String pretraga)
{
model.addAttribute("loggedUser", loggedUser);
List<Oglas> listaOglasa = oRepo.findAll( vrstaOglasaId, lokacijaId, brojSoba, cenaMin, cenaMax, kvadraturaMin,kvadraturaMax, lift, grejanje, namesten, pretraga);
while(listaOglasa.size() % 3 != 0){
Oglas o = new Oglas();
listaOglasa.add(o);
}
model.addAttribute("oglasi",listaOglasa);
List<String> list = new ArrayList<String>();
for (Oglas o:listaOglasa) {
list.add(kRepo.findCity(o.getLokacijaId()));
}
model.addAttribute("gradovi",list);
model.addAttribute("lokacije", lRepo.findAll());
model.addAttribute("slikeOglasa", sRepo.findAllFirstPics(listaOglasa));
return "/lista-oglasa";
}
@GetMapping("/profile/moji-oglasi") @GetMapping("/profile/moji-oglasi")
public String getMojiOglasa( Model model, public String getMojiOglasa( Model model,
@AuthenticationPrincipal KorisnikDetails loggedUser, @AuthenticationPrincipal KorisnikDetails loggedUser,
......
SkuciSe/src/main/java/com/example/SkuciSe/repository/LajkRepository.java
...@@ -53,8 +53,8 @@ public class LajkRepository { ...@@ -53,8 +53,8 @@ public class LajkRepository {
try { try {
String sql = "{call deleteLajk(?,?)}"; String sql = "{call deleteLajk(?,?)}";
stmt = dataBase.connection.prepareCall( sql); stmt = dataBase.connection.prepareCall( sql);
stmt.setInt(1, lajk.getKorisnikId()); stmt.setInt(1, lajk.getOglasId());
stmt.setInt(2, lajk.getOglasId()); stmt.setInt(2, lajk.getKorisnikId());
stmt.execute(); stmt.execute();
} catch (SQLException e) { } catch (SQLException e) {
System.out.println(e.getMessage()); System.out.println(e.getMessage());
...@@ -94,8 +94,8 @@ public class LajkRepository { ...@@ -94,8 +94,8 @@ public class LajkRepository {
try { try {
String sql = "{call isLiked(?,?)}"; String sql = "{call isLiked(?,?)}";
stmt = dataBase.connection.prepareCall( sql); stmt = dataBase.connection.prepareCall( sql);
stmt.setInt(1, lajk.getKorisnikId()); stmt.setInt(1, lajk.getOglasId());
stmt.setInt(2, lajk.getOglasId()); stmt.setInt(2, lajk.getKorisnikId());
rs=stmt.executeQuery(); rs=stmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment