Changeset eb5426c for src/main/java/com

Timestamp:

02/06/23 03:59:41 (22 months ago)

Author:

DenicaKj <dkorvezir@…>

Branches:

master

Children:

f8ef9bd

Parents:

448bd84

Message:

Home Page

Location:

src/main/java/com/example/moviezone

Files:

• config/WebSecurityConfig.java (modified) (1 diff)
• model/Film.java (modified) (1 diff)
• model/Projection.java (modified) (1 diff)
• repository/FilmRepository.java (modified) (1 diff)
• repository/ProjectionRepository.java (modified) (1 diff)
• service/FilmService.java (modified) (2 diffs)
• service/Impl/FilmServiceImpl.java (modified) (2 diffs)
• service/Impl/ProjectionServiceImpl.java (modified) (1 diff)
• service/ProjectionService.java (modified) (1 diff)
• web/HomeController.java (modified) (4 diffs)

src/main/java/com/example/moviezone/config/WebSecurityConfig.java

@@ -32 +32 @@
         http.csrf().disable()
                 .authorizeRequests()
-                .antMatchers("/", "/home", "/assets/**", "/register", "/api/**").permitAll()
+                .antMatchers("/","/home/getFilm/**", "/home", "/assets/**", "/register", "/api/**").permitAll()
                 .antMatchers("/admin/**").hasRole("ADMIN")
                 .anyRequest()

src/main/java/com/example/moviezone/model/Film.java

@@ -46 +46 @@
 
     }
+
+    public Integer getId_film() {
+        return id_film;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Integer getDuration() {
+        return duration;
+    }
+
+    public String getActors() {
+        return actors;
+    }
+
+    public String getGenre() {
+        return genre;
+    }
+
+    public String getAge_category() {
+        return age_category;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public String getDirector() {
+        return director;
+    }
+
+    public LocalDate getStart_date() {
+        return start_date;
+    }
+
+    public LocalDate getEnd_date() {
+        return end_date;
+    }
 }

src/main/java/com/example/moviezone/model/Projection.java

@@ -39 +39 @@
         this.film = film;
     }
+
+    public Projection() {
+    }
 }

src/main/java/com/example/moviezone/repository/FilmRepository.java

@@ -3 +3 @@
 import com.example.moviezone.model.Film;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.query.Procedure;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
 
 public interface FilmRepository extends JpaRepository<Film,Integer> {
+
 }

src/main/java/com/example/moviezone/repository/ProjectionRepository.java

@@ -9 +9 @@
 public interface ProjectionRepository extends JpaRepository<Projection,Integer> {
     //    NOTE: CHANGE THIS WITH MATERIALIZED VIEW
-    List<Projection> findAllByDate_time_startBefore(LocalDate datum);
+    //List<Projection> findAllBydate_time_startBefore(LocalDate datum);
 }

src/main/java/com/example/moviezone/service/FilmService.java

@@ -5 +5 @@
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Optional;
 
 public interface FilmService {
@@ -10 +11 @@
     Film save(String name, Integer duration, String actors, String genre,
               String age_category, String url, String director, LocalDate start_date,LocalDate end_date);
+    Optional<Film> getFilmById(Long id);
 }

src/main/java/com/example/moviezone/service/Impl/FilmServiceImpl.java

@@ -7 +7 @@
 
 import java.time.LocalDate;
+import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
 @Service
@@ -26 +28 @@
         return filmRepository.save(new Film(name,duration,actors,genre,age_category,url,director,start_date,end_date));
     }
+
+    @Override
+    public Optional<Film> getFilmById(Long id) {
+        return filmRepository.findAllById(Collections.singleton(id.intValue())).stream().findFirst();
+    }
+
 }

src/main/java/com/example/moviezone/service/Impl/ProjectionServiceImpl.java

@@ -25 +25 @@
     }
 
-    @Override
-    public List<Projection> findAllAvailableProjections(LocalDate date) {
-        return projectionRepository.findAllByDate_time_startBefore(date);
-    }
 
     @Override

src/main/java/com/example/moviezone/service/ProjectionService.java

@@ -9 +9 @@
 public interface ProjectionService {
     List<Projection> findAllProjections();
-List<Projection> findAllAvailableProjections(LocalDate date);
 Projection save(LocalDate date_time_start,LocalDate date_time_end, String type_of_technology, Integer id_film );
 }

src/main/java/com/example/moviezone/web/HomeController.java

@@ -3 +3 @@
 
 import com.example.moviezone.model.Customer;
+import com.example.moviezone.model.Film;
 import com.example.moviezone.model.User;
 import com.example.moviezone.model.exceptions.UserNotFoundException;
@@ -9 +10 @@
 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 javax.servlet.http.HttpSession;
 import java.time.LocalDate;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 
 @Controller
-@RequestMapping("/")
+@RequestMapping({"/","/home"})
 public class HomeController {
 
@@ -37 +38 @@
     }
 
-    @GetMapping({"/","/home"})
+    @GetMapping
     public String getHomePage(Model model) {
+        List<Film> films=filmService.findAllFilms();
+        films=films.stream().limit(5).collect(Collectors.toList());
+        model.addAttribute("films", films);
         model.addAttribute("bodyContent", "home");
+
+        return "master-template";
+    }
+    @GetMapping("/getFilm/{id}")
+    public String getFilm(@PathVariable Long id, Model model) {
+        Optional<Film> film=filmService.getFilmById(id);
+        model.addAttribute("film", film);
+        model.addAttribute("bodyContent", "home");
+
         return "master-template";
     }
@@ -97 +110 @@
     public String getProjectionsPage(Model model)
     {
-        model.addAttribute("projections",projectionService.findAllAvailableProjections(LocalDate.now()));
+        model.addAttribute("projections",projectionService.findAllProjections());
         model.addAttribute("bodyContent","projections");
         return "master-template";