Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • xhavlic/pb138-film-database-group-project
1 result
Show changes
Commits on Source (6)
...@@ -26,6 +26,9 @@ export class DirectorsService { ...@@ -26,6 +26,9 @@ export class DirectorsService {
where: { where: {
id, id,
}, },
include: {
movies: true,
},
}); });
} }
......
...@@ -102,7 +102,11 @@ export class MoviesService { ...@@ -102,7 +102,11 @@ export class MoviesService {
async update(id: string, updateMovieDto: UpdateMovieDto): Promise<Movie> { async update(id: string, updateMovieDto: UpdateMovieDto): Promise<Movie> {
const updatedMovie = { const updatedMovie = {
...(await this.findOne(id)), ...(await this.prisma.movie.findUnique({
where: {
id,
},
})),
...plainToClass(MovieEntity, updateMovieDto), ...plainToClass(MovieEntity, updateMovieDto),
}; };
return await this.prisma.movie.update({ return await this.prisma.movie.update({
......
import { Descriptions } from "antd"; import { Descriptions } from "antd";
import axiosConfig from '../axios-config'; import axiosConfig from '../axios-config';
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useParams } from "react-router-dom"; import {Link, useParams} from "react-router-dom";
import { ErrorPage } from "./ErrorPage"; import { ErrorPage } from "./ErrorPage";
import { DirectorDTO } from "../dto"; import {DirectorDTO, MovieDTO} from "../dto";
export const DirectorPage = () => { export const DirectorPage = () => {
const { id: directorId } = useParams(); const { id: directorId } = useParams();
const [director, setDirector] = useState<DirectorDTO>({} as DirectorDTO); const [director, setDirector] = useState<DirectorDTO>({} as DirectorDTO);
const [movies, setMovies] = useState<MovieDTO[]>([]);
const [isError, setIsError] = useState<boolean>(false); const [isError, setIsError] = useState<boolean>(false);
useEffect(() => { useEffect(() => {
const fetchData = async () => { const fetchData = async () => {
try { try {
const response = await axiosConfig.get<DirectorDTO>(`/directors/${directorId}`); const response = await axiosConfig.get<DirectorDTO>(`/directors/${directorId}`);
setDirector({ ...response.data }); setDirector({ ...response.data })
setMovies(response.data.movies);
} catch { } catch {
setIsError(true); setIsError(true);
} }
...@@ -27,6 +29,14 @@ export const DirectorPage = () => { ...@@ -27,6 +29,14 @@ export const DirectorPage = () => {
return <ErrorPage />; return <ErrorPage />;
} }
const listItems = movies.map((movie) =>
<li>
<Link to={`/movie/${movie.id}`}>
{movie.name}
</Link>
</li>
);
return ( return (
<Descriptions title="Director page" bordered style={ <Descriptions title="Director page" bordered style={
{padding: "4%", width:"50%"} {padding: "4%", width:"50%"}
...@@ -37,6 +47,9 @@ export const DirectorPage = () => { ...@@ -37,6 +47,9 @@ export const DirectorPage = () => {
<Descriptions.Item label="Surname" span={3}> <Descriptions.Item label="Surname" span={3}>
{director.surname} {director.surname}
</Descriptions.Item> </Descriptions.Item>
<Descriptions.Item label="Movies" span={3}>
{listItems}
</Descriptions.Item>
<Descriptions.Item label="Birthdate"> <Descriptions.Item label="Birthdate">
{director.birthDate} {director.birthDate}
</Descriptions.Item> </Descriptions.Item>
......
...@@ -38,9 +38,9 @@ export const Preview: React.FC = () => { ...@@ -38,9 +38,9 @@ export const Preview: React.FC = () => {
direction="vertical" direction="vertical"
style={{ display: "flex", paddingTop: "2%" }} style={{ display: "flex", paddingTop: "2%" }}
> >
<PreviewBox title={"Editor's picks"} movies={movies} /> <PreviewBox title={"Editor's picks"} movies={moviesRecent} />
<Divider/> <Divider/>
<PreviewBox title={"Recent movies"} movies={moviesRecent} /> <PreviewBox title={"Recent movies"} movies={movies} />
</Space> </Space>
); );
} }
......
...@@ -20,4 +20,5 @@ export interface DirectorDTO { ...@@ -20,4 +20,5 @@ export interface DirectorDTO {
name: string; name: string;
surname: string; surname: string;
birthDate?: string; birthDate?: string;
movies: MovieDTO[];
} }
This diff is collapsed.