Changeset 967b414 in Git for src/main/java

Timestamp:

02/09/22 03:21:13 (3 years ago)

Author:

GitHub <noreply@…>

Branches:

main

Children:

6f91f99

Parents:

0226942 (diff), 3fe36de (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Mato-77 <56981531+Mato-77@…> (02/09/22 03:21:13)

git-committer:

GitHub <noreply@…> (02/09/22 03:21:13)

Message:

Merge pull request #4 from partaloski/master

Added User profiles, improved clarity, improved UI

Location:

src/main/java/com/wediscussmovies/project

Files:

• configuration/SecurityConfig.java (modified) (1 diff)
• model/Movie.java (modified) (1 diff)
• model/Person.java (modified) (1 diff)
• service/UserService.java (modified) (1 diff)
• service/impl/UserServiceImpl.java (modified) (1 diff)
• web/controller/PersonController.java (modified) (1 diff)
• web/controller/UsersController.java (modified) (2 diffs)

src/main/java/com/wediscussmovies/project/configuration/SecurityConfig.java

@@ -29 +29 @@
         http.csrf().disable()
                 .authorizeRequests()
-                .antMatchers("/movies","/movies/**/","/actors","/persons/**/","/directors","/discussions","/discussions/**/","/discussions/all/**/","/replies","/register","/genres", "/css/**","/img/**", "/js/**").permitAll()
+                .antMatchers("/movies","/movies/**/","/actors","/persons/**/","/directors","/discussions","/profiles/**","/discussions/**/","/discussions/all/**/","/replies","/register","/genres", "/css/**","/img/**", "/js/**").permitAll()
                 .anyRequest()
                 .authenticated()

src/main/java/com/wediscussmovies/project/model/Movie.java

@@ -95 +95 @@
 
 
-
+    public String getShortTitle(){
+        int to = 20;
+        if (title.length() < to)
+            to = title.length();
+        if(to<20)
+            return title;
+        return title.substring(0, to) + "...";
+    }
 
 

src/main/java/com/wediscussmovies/project/model/Person.java

@@ -92 +92 @@
     }
 
+    public boolean hasGradeFromUser(User user){
+        for(PersonRates p: personRates){
+            if(p.getUser().getUserId() == user.getUserId())
+                return true;
+        }
+        return false;
+    }
+
 }

src/main/java/com/wediscussmovies/project/service/UserService.java

@@ -10 +10 @@
      User findByUsername(String username);
      User register(String email, String username, String password, String confirmPassword, String name, String surname);
+
+    User findById(Integer id);
 }

src/main/java/com/wediscussmovies/project/service/impl/UserServiceImpl.java

@@ -48 +48 @@
 
     @Override
+    public User findById(Integer id) {
+        return userRepository.findById(id).orElseThrow(() -> new UserNotExistException(id.toString()));
+    }
+
+    @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
         return this.findByUsername(username);

src/main/java/com/wediscussmovies/project/web/controller/PersonController.java

@@ -55 +55 @@
         //Error handling, could be null!!!!!!!!!
         model.addAttribute("person", person);
-
+        addModelPropertiesForUser(model);
         model.addAttribute("contentTemplate", "personShow");
         return "template";

src/main/java/com/wediscussmovies/project/web/controller/UsersController.java

@@ -11 +11 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
@@ -42 +39 @@
             return "redirect:/register?error=" + exception.getMessage();
         }
+    }
+    @GetMapping("/profiles/{id}")
+    public String getProfilePage(@PathVariable Integer id, Model model){
+        model.addAttribute("user",userService.findById(id));
+        model.addAttribute("contentTemplate","usersShow");
+        return "template";
     }
     @GetMapping("/register")