refactor: specific type CSFDMovieCreator

Author: bartholomej

src/helpers/movie.helper.ts

@@ -2,9 +2,9 @@ import { HTMLElement } from 'node-html-parser';
 import { CSFDColorRating } from '../interfaces/global';
 import {
   CSFDBoxContent,
-  CSFDCreator,
   CSFDCreatorGroups,
   CSFDGenres,
+  CSFDMovieCreator,
   CSFDMovieListItem,
   CSFDPremiere,
   CSFDTitlesOther,
@@ -161,7 +161,7 @@ export const getMovieDescriptions = (el: HTMLElement): string[] => {
     .map((movie) => movie.textContent?.trim().replace(/(\r\n|\n|\r|\t)/gm, ''));
 };
 
-const parseMoviePeople = (el: HTMLElement): CSFDCreator[] => {
+const parseMoviePeople = (el: HTMLElement): CSFDMovieCreator[] => {
   const people = el.querySelectorAll('a');
   return (
     people
@@ -177,7 +177,7 @@ const parseMoviePeople = (el: HTMLElement): CSFDCreator[] => {
   );
 };
 
-export const getMovieGroup = (el: HTMLElement, group: CSFDCreatorGroups): CSFDCreator[] => {
+export const getMovieGroup = (el: HTMLElement, group: CSFDCreatorGroups): CSFDMovieCreator[] => {
   const creators = el.querySelectorAll('.creators h4');
   const element = creators.filter((elem) => elem.textContent.trim().includes(group))[0];
   if (element?.parentNode) {

src/helpers/search.helper.ts

@@ -1,6 +1,6 @@
 import { HTMLElement } from 'node-html-parser';
 import { CSFDColorRating, CSFDFilmTypes } from '../interfaces/global';
-import { CSFDCreator } from '../interfaces/movie.interface';
+import { CSFDMovieCreator } from '../interfaces/movie.interface';
 import { Colors } from '../interfaces/user-ratings.interface';
 import { addProtocol, parseColor, parseIdFromUrl } from './global.helper';
 
@@ -41,7 +41,7 @@ export const getSearchOrigins = (el: HTMLElement): string[] => {
   return originsAll?.split('/').map((country) => country.trim());
 };
 
-export const parseSearchPeople = (el: HTMLElement, type: 'directors' | 'actors'): CSFDCreator[] => {
+export const parseSearchPeople = (el: HTMLElement, type: 'directors' | 'actors'): CSFDMovieCreator[] => {
   let who: Creator;
   if (type === 'directors') who = 'Režie:';
   if (type === 'actors') who = 'Hrají:';

src/interfaces/movie.interface.ts

@@ -46,24 +46,24 @@ export interface CSFDVod {
 }
 
 export interface CSFDCreators {
-  directors: CSFDCreator[];
-  writers: CSFDCreator[];
-  cinematography: CSFDCreator[];
-  music: CSFDCreator[];
-  actors: CSFDCreator[];
-  basedOn: CSFDCreator[];
-  producers: CSFDCreator[];
-  filmEditing: CSFDCreator[];
-  costumeDesign: CSFDCreator[];
-  productionDesign: CSFDCreator[];
+  directors: CSFDMovieCreator[];
+  writers: CSFDMovieCreator[];
+  cinematography: CSFDMovieCreator[];
+  music: CSFDMovieCreator[];
+  actors: CSFDMovieCreator[];
+  basedOn: CSFDMovieCreator[];
+  producers: CSFDMovieCreator[];
+  filmEditing: CSFDMovieCreator[];
+  costumeDesign: CSFDMovieCreator[];
+  productionDesign: CSFDMovieCreator[];
 }
 
 export interface CSFDTitlesOther {
   country: string;
   title: string;
 }
 
-export interface CSFDCreator {
+export interface CSFDMovieCreator {
   /**
    * CSFD person ID.
    *

src/interfaces/search.interface.ts

@@ -1,5 +1,5 @@
 import { CSFDScreening } from './global';
-import { CSFDCreator } from './movie.interface';
+import { CSFDMovieCreator } from './movie.interface';
 
 export interface CSFDSearch {
   movies: CSFDSearchMovie[];
@@ -22,11 +22,11 @@ export interface CSFDSearchUser {
   url: string;
 }
 
-export interface CSFDSearchCreator extends CSFDCreator {
+export interface CSFDSearchCreator extends CSFDMovieCreator {
   image: string;
 }
 
 export interface CSFDSearchCreators {
-  directors: CSFDCreator[];
-  actors: CSFDCreator[];
+  directors: CSFDMovieCreator[];
+  actors: CSFDMovieCreator[];
 }

tests/search.test.ts

@@ -12,7 +12,7 @@ import {
   parseSearchPeople
 } from '../src/helpers/search.helper';
 import { CSFDColorRating, CSFDFilmTypes } from '../src/interfaces/global';
-import { CSFDCreator } from '../src/interfaces/movie.interface';
+import { CSFDMovieCreator } from '../src/interfaces/movie.interface';
 import { searchMock } from './mocks/search.html';
 
 const html = parse(searchMock);
@@ -138,7 +138,7 @@ describe('Get Movie origins', () => {
 describe('Get Movie creators', () => {
   test('First movie directors', () => {
     const movie = parseSearchPeople(moviesNode[0], 'directors');
-    expect(movie).toEqual<CSFDCreator[]>([
+    expect(movie).toEqual<CSFDMovieCreator[]>([
       {
         id: 3112,
         name: 'Lilly Wachowski',
@@ -153,7 +153,7 @@ describe('Get Movie creators', () => {
   });
   test('Last movie actors', () => {
     const movie = parseSearchPeople(moviesNode[moviesNode.length - 1], 'actors');
-    expect(movie).toEqual<CSFDCreator[]>([
+    expect(movie).toEqual<CSFDMovieCreator[]>([
       {
         id: 67747,
         name: "Genevieve O'Reilly",
@@ -168,7 +168,7 @@ describe('Get Movie creators', () => {
   });
   test('Empty actors', () => {
     const movie = parseSearchPeople(moviesNode[5], 'actors');
-    expect(movie).toEqual<CSFDCreator[]>([]);
+    expect(movie).toEqual<CSFDMovieCreator[]>([]);
   });
 });
 
@@ -286,7 +286,7 @@ describe('Get TV series origins', () => {
 describe('Get TV series creators', () => {
   test('First TV series directors', () => {
     const movie = parseSearchPeople(tvSeriesNode[0], 'directors');
-    expect(movie).toEqual<CSFDCreator[]>([
+    expect(movie).toEqual<CSFDMovieCreator[]>([
       {
         id: 8877,
         name: 'Allan Eastman',
@@ -301,7 +301,7 @@ describe('Get TV series creators', () => {
   });
   test('Last TV series actors', () => {
     const movie = parseSearchPeople(tvSeriesNode[tvSeriesNode.length - 1], 'actors');
-    expect(movie).toEqual<CSFDCreator[]>([
+    expect(movie).toEqual<CSFDMovieCreator[]>([
       {
         id: 20335,
         name: 'Billy West',
@@ -316,19 +316,19 @@ describe('Get TV series creators', () => {
   });
   test('Empty actors', () => {
     const movie = parseSearchPeople(tvSeriesNode[5], 'actors');
-    expect(movie).toEqual<CSFDCreator[]>([]);
+    expect(movie).toEqual<CSFDMovieCreator[]>([]);
   });
   test('Empty directors + some actors', () => {
     const movie = parseSearchPeople(tvSeriesNode[4], 'actors');
     const movieDirectors = parseSearchPeople(tvSeriesNode[4], 'directors');
-    expect(movie).toEqual<CSFDCreator[]>([
+    expect(movie).toEqual<CSFDMovieCreator[]>([
       {
         id: 61834,
         name: 'David Icke',
         url: 'https://www.csfd.cz/tvurce/61834-david-icke/'
       }
     ]);
-    expect(movieDirectors).toEqual<CSFDCreator[]>([]);
+    expect(movieDirectors).toEqual<CSFDMovieCreator[]>([]);
   });
 });