Merge pull request #55 from JHWelch/add-time

Add time

__tests__/controllers/cacheController.spec.ts

@@ -97,6 +97,7 @@ describe('cache', () => {
         'director',
         2001,
         90,
+        null,
         'https://www.themoviedb.org/movie/1234',
         '/poster.jpg',
         1234,
@@ -107,6 +108,7 @@ describe('cache', () => {
         'director',
         2001,
         90,
+        null,
         'https://www.themoviedb.org/movie/1234',
         '/poster.jpg',
         1234,

__tests__/data/firestore/firestoreAdapter.spec.ts

@@ -19,6 +19,7 @@ import { transaction } from '../../../__mocks__/firebase/firestore'
 import { FirebaseMock } from '../../support/firebaseMock'
 import Week from '../../../src/models/week'
 import { mockConfig } from '../../support/mockConfig'
+import MovieFactory from '../../support/factories/movieFactory'
 
 let firestore: FirestoreAdapter
 
@@ -195,31 +196,40 @@ describe('cacheWeeks', () => {
     })
   })
 
+  it('can update a week with movies', async () => {
+    const movie = new MovieFactory().make()
+    const weekWithMovie = new Week(
+      'id1',
+      'theme1',
+      new Date('2021-01-01'),
+      false,
+      [movie],
+    )
+
+    await firestore.cacheWeeks([
+      weekWithMovie,
+    ])
+
+    expect(transaction.set)
+      .toHaveBeenCalledWith(
+        FirebaseMock.mockDoc('weeks', '2021-01-01'),
+        FirebaseMock.mockWeek('id1', 'theme1', '2021-01-01', [movie])
+      )
+  })
+
   describe('when mode is development', () => {
     it('uses the development collection', async () => {
       firestore = new FirestoreAdapter(mockConfig({ nodeEnv: 'development' }))
 
       await firestore.cacheWeeks([
         new Week('id1', 'theme1', new Date('2021-01-01')),
-        new Week('id2', 'theme2', new Date('2021-01-08')),
-        new Week('id3', 'theme3', new Date('2021-01-15')),
       ])
 
       expect(transaction.set)
         .toHaveBeenCalledWith(
           FirebaseMock.mockDoc('weeks-dev', '2021-01-01'),
           FirebaseMock.mockWeek('id1', 'theme1', '2021-01-01')
         )
-      expect(transaction.set)
-        .toHaveBeenCalledWith(
-          FirebaseMock.mockDoc('weeks-dev', '2021-01-08'),
-          FirebaseMock.mockWeek('id2', 'theme2', '2021-01-08')
-        )
-      expect(transaction.set)
-        .toHaveBeenCalledWith(
-          FirebaseMock.mockDoc('weeks-dev', '2021-01-15'),
-          FirebaseMock.mockWeek('id3', 'theme3', '2021-01-15')
-        )
     })
   })
 })

__tests__/data/notion/notionAdapter.spec.ts

@@ -45,6 +45,7 @@ describe('getMovie', () => {
         director: 'movieDirector',
         year: 2021,
         length: 120,
+        time: '8:00 PM',
         url: 'movieUrl',
         posterPath: 'moviePosterPath',
         theaterName: 'movieTheaterName',
@@ -179,6 +180,7 @@ describe('setMovie', () => {
       'Movie Director',
       2021,
       120,
+      '8:00 PM',
       'Movie Url',
       'Movie Poster Url',
       1234,

__tests__/data/tmdb/tmdbAdapter.spec.ts

@@ -24,6 +24,7 @@ describe('getMovie', () => {
       'director',
       2001,
       90,
+      null,
       'https://www.themoviedb.org/movie/1234',
       '/posterPath.jpg',
       1234,

__tests__/models/movie.spec.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it, test } from '@jest/globals'
 import Movie from '../../src/models/movie'
-import { MovieFactory } from '../support/factories/movieFactory'
+import MovieFactory from '../support/factories/movieFactory'
 import { TMDB_POSTER_URL } from '../../src/data/tmdb/constants'
 
 describe('merge', () => {
@@ -11,6 +11,7 @@ describe('merge', () => {
       'Director',
       2001,
       null,
+      '8:00 PM',
       'https://www.themoviedb.org/movie/1234',
       'https://image.tmdb.org/t/p/original/poster.jpg',
       1234,
@@ -23,6 +24,7 @@ describe('merge', () => {
       'Director',
       2004,
       120,
+      '8:00 PM',
       'https://www.themoviedb.org/movie/1234',
       'https://image.tmdb.org/t/p/original/poster.jpg',
       1234,
@@ -37,6 +39,7 @@ describe('toNotion', () => {
       'Movie Director',
       2021,
       120,
+      '8:00 PM',
       'Movie Url',
       'Movie Poster Url',
       1234,
@@ -69,6 +72,7 @@ describe('toNotion', () => {
         'Movie Director',
         2021,
         120,
+        '8:00 PM',
         'Movie Url',
         'Movie Poster Url',
         1234,
@@ -92,6 +96,7 @@ describe('toDTO', () => {
       director: movie.director,
       year: movie.year,
       length: movie.length,
+      time: movie.time,
       url: movie.url,
       posterUrl: movie.posterUrl(),
       theaterName: movie.theaterName,
@@ -113,6 +118,7 @@ describe('toDTO', () => {
         director: movie.director,
         year: movie.year,
         length: movie.length,
+        time: movie.time,
         url: movie.url,
         posterUrl: movie.posterUrl(),
         theaterName: movie.theaterName,
@@ -124,6 +130,26 @@ describe('toDTO', () => {
   })
 })
 
+describe('toFirebaseDTO', () => {
+  it('should return a DTO', () => {
+    const movie = new MovieFactory().make()
+
+    expect(movie.toFirebaseDTO()).toEqual({
+      title: movie.title,
+      director: movie.director,
+      year: movie.year,
+      length: movie.length,
+      time: movie.time,
+      url: movie.url,
+      posterPath: movie.posterPath,
+      tmdbId: movie.tmdbId,
+      notionId: movie.notionId,
+      theaterName: movie.theaterName,
+      showingUrl: movie.showingUrl,
+    })
+  })
+})
+
 describe('posterUrl', () => {
   it('appends the posterPath to the base url', () => {
     const movie = new MovieFactory().make()

__tests__/support/factories/movieFactory.ts

@@ -1,11 +1,12 @@
 import Movie from '../../../src/models/movie'
 
-export class MovieFactory {
+export default class MovieFactory {
   private _state = {
     title: 'Movie Title',
     director: 'Movie Director',
     year: 2021,
     length: 90,
+    time: '8:00 PM',
     url: 'https://example.com/movie1234',
     tmdbId: 1234,
     posterPath: '/path/to/poster.jpg',
@@ -20,6 +21,7 @@ export class MovieFactory {
       this._state.director,
       this._state.year,
       this._state.length,
+      this._state.time,
       this._state.url,
       this._state.posterPath,
       this._state.tmdbId,

__tests__/support/firebaseMock.ts

@@ -2,6 +2,7 @@ import { getDocs, getDoc, Timestamp, WithFieldValue } from 'firebase/firestore'
 import { jest } from '@jest/globals'
 import { FirestoreWeek } from '../../src/data/firestore/firestoreTypes'
 import Week from '../../src/models/week'
+import Movie from '../../src/models/movie'
 
 export class FirebaseMock {
   static mockWeeks (weeks: FirebaseWeek[]) {
@@ -44,9 +45,10 @@ export class FirebaseMock {
   static mockWeek = (
     id: string,
     theme: string,
-    date: string
+    date: string,
+    movies: Movie[] = [],
   ): WithFieldValue<FirestoreWeek> =>
-    new Week(id, theme, new Date(date), false).toFirebaseDTO()
+    new Week(id, theme, new Date(date), false, movies).toFirebaseDTO()
 
   static mockCollection = (collectionPath: string): {
     firestore: { firestore: 'firestore' },

__tests__/support/notionHelpers.ts

@@ -153,6 +153,7 @@ export class NotionMovie {
     public director: string | null = null,
     public year: number | null = null,
     public length: number | null = null,
+    public time: string | null = null,
     public url: string | null = null,
     public posterPath: string | null = null,
     public theaterName: string | null = null,
@@ -165,6 +166,7 @@ export class NotionMovie {
       Director: nRichText(this.director),
       Year: nNumber(this.year),
       'Length (mins)': nNumber(this.length),
+      Time: nRichText(this.time),
       URL: nUrl(this.url),
       Poster: nUrl(this.posterPath),
       'Theater Name': nRichText(this.theaterName),
@@ -179,6 +181,7 @@ export class NotionMovie {
       'movieDirector',
       2021,
       120,
+      '8:00 PM',
       'movieUrl',
       'moviePosterPath',
       'movieTheaterName',

__tests__/support/notionMock.ts

@@ -51,16 +51,10 @@ export class NotionMock {
     const notionMovie = movie ?? NotionMovie.demo()
 
     this.retrieve.mockImplementation(async (
-      args: WithAuth<GetPageParameters>
-    ): Promise<GetPageResponse> => {
-      const { page_id } = args as { page_id: string }
+      _args: WithAuth<GetPageParameters>
+    ): Promise<GetPageResponse> =>
+      notionMovie.toPageObjectResponse())
 
-      if (page_id !== notionMovie.id) {
-        throw new Error('Page not found')
-      }
-
-      return notionMovie.toPageObjectResponse()
-    })
     return { pages: { retrieve: this.retrieve } }
   }
 

package.json

@@ -15,6 +15,8 @@
     "lint": "eslint . --ext .ts",
     "fix": "eslint . --ext .ts --fix",
     "test": "jest",
+    "test-watch": "jest --watch",
+    "coverage": "jest --coverage",
     "watch": "concurrently \"npm run watch-express\" \"npm run watch-tailwind\"",
     "watch-express": "nodemon src/index.ts",
     "watch-tailwind": "npx tailwindcss -i ./css/app.css -o ./public/app.css --watch"

src/data/firestore/firestoreTypes.ts

@@ -13,6 +13,7 @@ export type FirestoreMovie = {
   director: string | null;
   year: number | null;
   length: number | null;
+  time: string | null;
   url: string | null;
   posterPath: string | null;
   tmdbId: number | null;

src/models/movie.ts

@@ -20,6 +20,7 @@ export default class Movie {
     public director: string | null = null,
     public year: number | null = null,
     public length: number | null = null,
+    public time: string | null = null,
     public url: string | null = null,
     public posterPath: string | null = null,
     public tmdbId: number | null = null,
@@ -36,6 +37,7 @@ export default class Movie {
       properties.Director?.rich_text[0]?.plain_text,
       properties.Year?.number,
       properties['Length (mins)']?.number,
+      properties.Time?.rich_text[0]?.plain_text,
       properties.URL?.url,
       properties.Poster?.url,
       null,
@@ -51,6 +53,7 @@ export default class Movie {
       movie.director,
       movie.year,
       movie.length,
+      movie.time,
       movie.url,
       movie.posterPath,
       movie.tmdbId,
@@ -66,6 +69,7 @@ export default class Movie {
       tmdbResponse.director,
       parseInt(tmdbResponse.releaseDate.split('-')[0]),
       tmdbResponse.runtime ?? -1,
+      null,
       tmdbResponse.fullMovieUrl,
       tmdbResponse.posterPath,
       tmdbResponse.id,
@@ -102,6 +106,7 @@ export default class Movie {
       director: this.director,
       year: this.year,
       length: this.length,
+      time: this.time,
       url: this.url,
       posterUrl: this.posterUrl(),
       theaterName: this.theaterName,
@@ -117,6 +122,7 @@ export default class Movie {
       director: this.director,
       year: this.year,
       length: this.length,
+      time: this.time,
       url: this.url,
       tmdbId: this.tmdbId,
       notionId: this.notionId,
@@ -149,6 +155,7 @@ export default class Movie {
     this.director ??= other.director
     this.year ??= other.year
     this.length ??= other.length
+    this.time ??= other.time
     this.url ??= other.url
     this.posterPath ??= other.posterPath
     this.tmdbId ??= other.tmdbId

src/types/movieProperties.ts

@@ -15,6 +15,11 @@ export default interface MovieProperties {
   'Length (mins)': {
     number: number
   }
+  Time: {
+    rich_text: Array<{
+      plain_text: string
+    }>
+  }
   URL: {
     url: string
   }

views/partials/movie.ejs

@@ -1,10 +1,16 @@
 <div :class="`px-3 sm:${movieSizeClasses(week)}`">
   <div class="flex flex-col px-4 py-2 rounded-md bg-violet-200 ">
-    <h4 class="flex items-center justify-center h-12">
+    <h4 class="flex items-center justify-between h-12 px-2">
       <span
         x-text="movie.title"
         :class="titleSize(movie) + ' overflow-hidden font-medium text-center  overflow-ellipsis'"
       ></span>
+
+      <span
+        x-show="movie.time"
+        x-text="movie.time"
+        class="text-md overflow-hidden font-medium text-center overflow-ellipsis bg-violet-700 text-white px-2 py-0.5 rounded-2xl"
+      ></span>
     </h4>
 
     <div class="flex flex-col justify-between flex-1">

views/partials/movie/field_trip_banner.ejs

@@ -1,7 +1,7 @@
 <template x-if="movie.isFieldTrip">
   <a
     :href="movie.showingUrl"
-    class="absolute inset-0 flex items-center justify-between w-full h-12 p-3 font-medium text-center text-white text-md opacity-80 bg-fuchsia-500"
+    class="absolute inset-0 flex items-center justify-between w-full h-12 p-3 font-medium text-center text-white text-md bg-opacity-80 bg-violet-500"
   >
     <span x-text="movie.theaterName"></span>