Request Model (#79)

* feat(api): request model

Also adds request binding to search/discover results

* fix(api): rename Request to MediaRequest and update nextjs tsconfig

* refactor(api): move related request fetching code into MediaRequest entity

server/routes/auth.ts

@@ -37,7 +37,7 @@ authRoutes.post('/login', async (req, res) => {
 
     // Next let's see if the user already exists
     let user = await userRepository.findOne({
-      where: { email: account.email },
+      where: { plexId: account.id },
     });
 
     if (user) {
@@ -49,6 +49,8 @@ authRoutes.post('/login', async (req, res) => {
 
       // Update the users avatar with their plex thumbnail (incase it changed)
       user.avatar = account.thumb;
+      user.email = account.email;
+      user.username = account.username;
     } else {
       // Here we check if it's the first user. If it is, we create the user with no check
       // and give them admin permissions
@@ -57,6 +59,8 @@ authRoutes.post('/login', async (req, res) => {
       if (totalUsers === 0) {
         user = new User({
           email: account.email,
+          username: account.username,
+          plexId: account.id,
           plexToken: account.authToken,
           permissions: Permission.ADMIN,
           avatar: account.thumb,

server/routes/discover.ts

@@ -1,6 +1,7 @@
 import { Router } from 'express';
 import TheMovieDb from '../api/themoviedb';
 import { mapMovieResult, mapTvResult } from '../models/Search';
+import { MediaRequest } from '../entity/MediaRequest';
 
 const discoverRoutes = Router();
 
@@ -9,11 +10,20 @@ discoverRoutes.get('/movies', async (req, res) => {
 
   const data = await tmdb.getDiscoverMovies({ page: Number(req.query.page) });
 
+  const requests = await MediaRequest.getRelatedRequests(
+    data.results.map((result) => result.id)
+  );
+
   return res.status(200).json({
     page: data.page,
     totalPages: data.total_pages,
     totalResults: data.total_results,
-    results: data.results.map(mapMovieResult),
+    results: data.results.map((result) =>
+      mapMovieResult(
+        result,
+        requests.find((req) => req.mediaId === result.id)
+      )
+    ),
   });
 });
 
@@ -22,11 +32,20 @@ discoverRoutes.get('/tv', async (req, res) => {
 
   const data = await tmdb.getDiscoverTv({ page: Number(req.query.page) });
 
+  const requests = await MediaRequest.getRelatedRequests(
+    data.results.map((result) => result.id)
+  );
+
   return res.status(200).json({
     page: data.page,
     totalPages: data.total_pages,
     totalResults: data.total_results,
-    results: data.results.map(mapTvResult),
+    results: data.results.map((result) =>
+      mapTvResult(
+        result,
+        requests.find((req) => req.mediaId === result.id)
+      )
+    ),
   });
 });
 

server/routes/search.ts

@@ -1,6 +1,7 @@
 import { Router } from 'express';
 import TheMovieDb from '../api/themoviedb';
 import { mapSearchResults } from '../models/Search';
+import { MediaRequest } from '../entity/MediaRequest';
 
 const searchRoutes = Router();
 
@@ -12,11 +13,15 @@ searchRoutes.get('/', async (req, res) => {
     page: Number(req.query.page),
   });
 
+  const requests = await MediaRequest.getRelatedRequests(
+    results.results.map((result) => result.id)
+  );
+
   return res.status(200).json({
     page: results.page,
     totalPages: results.total_pages,
     totalResults: results.total_results,
-    results: mapSearchResults(results.results),
+    results: mapSearchResults(results.results, requests),
   });
 });