Merge remote-tracking branch 'origin/master'

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

+package com.example.SkuciSe.configuration;
+
+public class EmailPostoji extends Exception
+{
+    public EmailPostoji( )
+    {
+
+    }
+}

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

 package com.example.SkuciSe.controller;
 
+import com.example.SkuciSe.configuration.EmailPostoji;
 import com.example.SkuciSe.model.korisnik.Korisnik;
 import com.example.SkuciSe.model.korisnik.KorisnikDetails;
 import com.example.SkuciSe.repository.KorisnikRepository;
@@ -48,10 +49,17 @@ public class AppController
     }
 
     @PostMapping("/register-proccess")
-    public String postRegisterProccess(@ModelAttribute Korisnik korisnik, @RequestParam("image") MultipartFile multipartFile)
+    public String postRegisterProccess(@ModelAttribute Korisnik korisnik, @RequestParam("image") MultipartFile multipartFile, Model model)
     {
         System.out.println(korisnik);
+        try {
             kRepo.insert( korisnik, multipartFile);
             return("redirect:/login");
+        } catch (EmailPostoji e) {
+            model.addAttribute("newUser", korisnik);
+            model.addAttribute("lokacije", lRepo.findAll());
+            //model.addAttribute("emailZauzet", true);
+            return("register");
+        }
     }
 }

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

 package com.example.SkuciSe.repository;
 
+import com.example.SkuciSe.configuration.EmailPostoji;
 import com.example.SkuciSe.model.korisnik.Korisnik;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -18,8 +19,7 @@ public class KorisnikRepository
     @Autowired
     LokacijaRepository lRepo;
 
-    public void insert( Korisnik korisnik, MultipartFile multipartFile)
-    {
+    public void insert( Korisnik korisnik, MultipartFile multipartFile) throws EmailPostoji {
         if( this.findByEmail( korisnik.getEmail()) == null)
         {
              try {
@@ -33,6 +33,10 @@ public class KorisnikRepository
                  System.out.println(e.getMessage());
             }
         }
+        else
+        {
+            throw new EmailPostoji();
+        }
     }
 
     public void update( Korisnik korisnik)