model oglas - dodati atributi

OglasController - dodat novi oglas reguest

SkuciSe/src/main/java/com/example/SkuciSe/configuration/WebSecurityConfig.java

@@ -41,7 +41,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter
     @Override
     protected void configure(HttpSecurity http) throws Exception {
         http.authorizeRequests()
-                .antMatchers("/profile/**","/moji-oglasi/**","/moji-zahtevi/**","/lista-korisnika").authenticated()
+                .antMatchers("/profile/**","/moji-oglasi/**","/moji-zahtevi/**","/lista-korisnika","/novi-oglas/**").authenticated()
                 .anyRequest().permitAll()
                 .and().formLogin().loginPage("/login").permitAll()
                 .usernameParameter("email")

SkuciSe/src/main/java/com/example/SkuciSe/controller/OglasController.java

+package com.example.SkuciSe.controller;
+
+import com.example.SkuciSe.model.korisnik.KorisnikDetails;
+import com.example.SkuciSe.model.oglas.Oglas;
+import com.example.SkuciSe.repository.KorisnikRepository;
+import com.example.SkuciSe.repository.LokacijaRepository;
+import com.example.SkuciSe.repository.OglasRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
+
+@Controller
+public class OglasController
+{
+    @Autowired
+    LokacijaRepository lRepo;
+
+    @Autowired
+    KorisnikRepository kRepo;
+
+    @Autowired
+    OglasRepository oRepo;
+
+    @GetMapping("/novi-oglas")
+    public String getNoviOglas(Model model, @AuthenticationPrincipal KorisnikDetails loggedUser)
+    {
+        model.addAttribute("loggedUser", loggedUser);
+        model.addAttribute("newOglas", new Oglas());
+        model.addAttribute("lokacije", lRepo.findAll());
+        return("novi-oglas-form");
+    }
+
+    @PostMapping("/novi-oglas/save")
+    public String postSaveNoviOglas( @ModelAttribute("newOglas") Oglas newOglas,  @RequestParam("images") MultipartFile[] files)
+    {
+        oRepo.insert( newOglas, files);
+        return("redirect:/profile");
+    }
+}

SkuciSe/src/main/java/com/example/SkuciSe/model/korisnik/Korisnik.java

 package com.example.SkuciSe.model.korisnik;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.*;
 
 import java.io.IOException;
 import java.util.Base64;
@@ -12,6 +9,7 @@ import java.util.Base64;
 @Getter
 @AllArgsConstructor
 @NoArgsConstructor
+@ToString
 public class Korisnik {
     int korisnikId;
     String ime;
@@ -22,20 +20,5 @@ public class Korisnik {
     private String slika;
     int tipId;
     int gradId;
-
     boolean enabled;
-    @Override
-    public String toString() {
-        return "Korisnik{" +
-                "korisnikId=" + korisnikId +
-                ", ime='" + ime + '\'' +
-                ", prezime='" + prezime + '\'' +
-                ", email='" + email + '\'' +
-                ", sifra='" + sifra + '\'' +
-                ", telefon='" + telefon + '\'' +
-                ", tipId=" + tipId +
-                ", gradId=" + gradId +
-                ", slika='" + slika + '\'' +
-                '}';
-    }
 }
\ No newline at end of file

SkuciSe/src/main/java/com/example/SkuciSe/model/oglas/Oglas.java

 package com.example.SkuciSe.model.oglas;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.*;
 
 @Getter
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
+@ToString
 public class Oglas
 {
     int oglasId;
     int korisnikId;
     String naslov;
     String opis;
-    String lokacija;
-    int gradId;
+    int lokacijaId;
     double cena;
-    double kvadratura;
     int vrstaOglasaId;
+    double kvadratura;
+    int brojSoba;
+    boolean namesten;
+    boolean grejanje;
+    boolean lift;
+    String lokacija;
 
-    public Oglas(int korisnikId, String naslov, String opis, String lokacija, int gradId, double cena, double kvadratura, int vrstaOglasaId) {
-        this.korisnikId = korisnikId;
-        this.naslov = naslov;
-        this.opis = opis;
-        this.lokacija = lokacija;
-        this.gradId = gradId;
-        this.cena = cena;
-        this.kvadratura = kvadratura;
-        this.vrstaOglasaId = vrstaOglasaId;
-    }
-
-    @Override
-    public String toString() {
-        return "Oglas{" +
-                "oglasId=" + oglasId +
-                ", korisnikId=" + korisnikId +
-                ", naslov='" + naslov + '\'' +
-                ", opis='" + opis + '\'' +
-                ", lokacija='" + lokacija + '\'' +
-                ", gradId=" + gradId +
-                ", cena=" + cena +
-                ", kvadratura=" + kvadratura +
-                ", vrstaOglasaId=" + vrstaOglasaId +
-                '}';
-    }
 }

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

@@ -26,10 +26,10 @@ public class KorisnikRepository
                  String slika = Base64.getEncoder().encodeToString(multipartFile.getBytes());
                  String sql = "insert into korisnik( ime, prezime, telefon, email, sifra, tipId, slika, gradid, enabled) values('"+korisnik.getIme()+"','"+korisnik.getPrezime()+"','"+korisnik.getTelefon()+"','"+korisnik.getEmail()+"','"+new BCryptPasswordEncoder().encode(korisnik.getSifra())+"',1, '"+ slika +"', "+korisnik.getGradId()+",false)";
                  dataBase.statement.executeUpdate( sql);
-            } catch (SQLException e) {
-                throw new RuntimeException(e);
              } catch (IOException e) {
-                 throw new RuntimeException(e);
+                 System.out.println(e.getMessage());
+             } catch (SQLException e) {
+                 System.out.println(e.getMessage());
              }
         }
     }

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

 package com.example.SkuciSe.repository;
 
+import com.example.SkuciSe.model.oglas.Oglas;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
 
 @Component
 public class OglasRepository
 {
     @Autowired
     DataBase dataBase;
+
+    public void insert(Oglas newOglas, MultipartFile[] files)
+    {
+
+    }
 }

SkuciSe/src/main/resources/application.properties

+spring.servlet.multipart.max-file-size=16MB
+spring.servlet.multipart.max-request-size=16MB
\ No newline at end of file