From 1cb31f43eafc8840a93e8ca0a0ef155458886be6 Mon Sep 17 00:00:00 2001
From: Brandon <cohbrandon@gmail.com>
Date: Mon, 6 Mar 2023 23:14:22 -0500
Subject: [PATCH 01/13] fix: modified media status handling when media has been
 deleted

---
 server/constants/media.ts      |  2 ++
 server/entity/SeasonRequest.ts | 16 ++++++++++++----
 server/lib/availabilitySync.ts |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/server/constants/media.ts b/server/constants/media.ts
index de2bf834..cf2e046c 100644
--- a/server/constants/media.ts
+++ b/server/constants/media.ts
@@ -3,6 +3,7 @@ export enum MediaRequestStatus {
   APPROVED,
   DECLINED,
   FAILED,
+  COMPLETED,
 }
 
 export enum MediaType {
@@ -16,4 +17,5 @@ export enum MediaStatus {
   PROCESSING,
   PARTIALLY_AVAILABLE,
   AVAILABLE,
+  DELETED,
 }
diff --git a/server/entity/SeasonRequest.ts b/server/entity/SeasonRequest.ts
index c55906eb..984c3d3b 100644
--- a/server/entity/SeasonRequest.ts
+++ b/server/entity/SeasonRequest.ts
@@ -1,7 +1,7 @@
 import { MediaRequestStatus } from '@server/constants/media';
 import { getRepository } from '@server/datasource';
 import {
-  AfterRemove,
+  AfterUpdate,
   Column,
   CreateDateColumn,
   Entity,
@@ -37,15 +37,23 @@ class SeasonRequest {
     Object.assign(this, init);
   }
 
-  @AfterRemove()
+  @AfterUpdate()
   public async handleRemoveParent(): Promise<void> {
     const mediaRequestRepository = getRepository(MediaRequest);
     const requestToBeDeleted = await mediaRequestRepository.findOneOrFail({
       where: { id: this.request.id },
     });
 
-    if (requestToBeDeleted.seasons.length === 0) {
-      await mediaRequestRepository.delete({ id: this.request.id });
+    const allSeasonsAreCompleted = requestToBeDeleted.seasons.filter(
+      (season) => {
+        return season.status === MediaRequestStatus.COMPLETED;
+      }
+    );
+
+    if (requestToBeDeleted.seasons.length === allSeasonsAreCompleted.length) {
+      await mediaRequestRepository.update(this.request.id, {
+        status: MediaRequestStatus.COMPLETED,
+      });
     }
   }
 }
diff --git a/server/lib/availabilitySync.ts b/server/lib/availabilitySync.ts
index 0a16302c..398701bc 100644
--- a/server/lib/availabilitySync.ts
+++ b/server/lib/availabilitySync.ts
@@ -330,7 +330,7 @@ class AvailabilitySync {
           media.mediaType === 'movie' ? 'movie' : 'show'
         } [TMDB ID ${media.tmdbId}] was not found in any ${
           media.mediaType === 'movie' ? 'Radarr' : 'Sonarr'
-        } and Plex instance. Status will be changed to unknown.`,
+        } and Plex instance. Status will be changed to deleted.`,
         { label: 'AvailabilitySync' }
       );
 

From 05ea56188b2f8346e555e9d2667a6059b93a75dd Mon Sep 17 00:00:00 2001
From: Brandon <cohbrandon@gmail.com>
Date: Fri, 10 Mar 2023 19:49:11 -0500
Subject: [PATCH 02/13] fix: requests will now be updated to completed on scan

---
 server/lib/scanners/baseScanner.ts | 111 ++++++++++++++++++++++++++++-
 server/routes/media.ts             |  30 +++++++-
 2 files changed, 139 insertions(+), 2 deletions(-)

diff --git a/server/lib/scanners/baseScanner.ts b/server/lib/scanners/baseScanner.ts
index f0f3db7e..170ebee6 100644
--- a/server/lib/scanners/baseScanner.ts
+++ b/server/lib/scanners/baseScanner.ts
@@ -1,8 +1,14 @@
 import TheMovieDb from '@server/api/themoviedb';
-import { MediaStatus, MediaType } from '@server/constants/media';
+import {
+  MediaRequestStatus,
+  MediaStatus,
+  MediaType,
+} from '@server/constants/media';
 import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
+import MediaRequest from '@server/entity/MediaRequest';
 import Season from '@server/entity/Season';
+import SeasonRequest from '@server/entity/SeasonRequest';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import AsyncLock from '@server/utils/asyncLock';
@@ -89,6 +95,53 @@ class BaseScanner<T> {
     return existing;
   }
 
+  private async requestUpdater(mediaId: number, is4k: boolean) {
+    const requestRepository = getRepository(MediaRequest);
+
+    const request = await requestRepository.findOne({
+      relations: {
+        media: true,
+      },
+      where: { media: { id: mediaId }, is4k: is4k },
+    });
+
+    await requestRepository.update(
+      { media: { id: request?.id } },
+      { status: MediaRequestStatus.COMPLETED }
+    );
+  }
+
+  private async seasonRequestUpdater(
+    mediaId: number | undefined,
+    seasonNumber: number,
+    is4k: boolean
+  ) {
+    const seasonRequestRepository = getRepository(SeasonRequest);
+
+    const seasonToBeCompleted = await seasonRequestRepository.findOne({
+      relations: {
+        request: {
+          media: true,
+        },
+      },
+      where: {
+        request: {
+          is4k: is4k,
+          media: {
+            id: mediaId,
+          },
+        },
+        seasonNumber: seasonNumber,
+      },
+    });
+
+    if (seasonToBeCompleted) {
+      await seasonRequestRepository.update(seasonToBeCompleted?.id, {
+        status: MediaRequestStatus.COMPLETED,
+      });
+    }
+  }
+
   protected async processMovie(
     tmdbId: number,
     {
@@ -162,7 +215,16 @@ class BaseScanner<T> {
         }
 
         if (changedExisting) {
+          if (existing['status'] === MediaStatus.AVAILABLE) {
+            this.requestUpdater(existing.id, false);
+          }
+
+          if (existing['status4k'] === MediaStatus.AVAILABLE) {
+            this.requestUpdater(existing.id, true);
+          }
+
           await mediaRepository.save(existing);
+
           this.log(
             `Media for ${title} exists. Changes were detected and the title will be updated.`,
             'info'
@@ -203,6 +265,15 @@ class BaseScanner<T> {
           newMedia.ratingKey4k =
             is4k && this.enable4kMovie ? ratingKey : undefined;
         }
+
+        if (newMedia['status'] === MediaStatus.AVAILABLE) {
+          this.requestUpdater(newMedia.id, false);
+        }
+
+        if (newMedia['status4k'] === MediaStatus.AVAILABLE && existing) {
+          this.requestUpdater(newMedia.id, true);
+        }
+
         await mediaRepository.save(newMedia);
         this.log(`Saved new media: ${title}`);
       }
@@ -297,6 +368,14 @@ class BaseScanner<T> {
               : season.is4kOverride && season.processing
               ? MediaStatus.PROCESSING
               : existingSeason.status4k;
+
+          if (existingSeason['status'] === MediaStatus.AVAILABLE) {
+            this.seasonRequestUpdater(media?.id, season.seasonNumber, false);
+          }
+
+          if (existingSeason['status4k'] === MediaStatus.AVAILABLE) {
+            this.seasonRequestUpdater(media?.id, season.seasonNumber, true);
+          }
         } else {
           newSeasons.push(
             new Season({
@@ -321,6 +400,18 @@ class BaseScanner<T> {
                   : MediaStatus.UNKNOWN,
             })
           );
+
+          if (season.totalEpisodes === season.episodes && season.episodes > 0) {
+            this.seasonRequestUpdater(media?.id, season.seasonNumber, false);
+          }
+
+          if (
+            this.enable4kShow &&
+            season.totalEpisodes === season.episodes4k &&
+            season.episodes4k > 0
+          ) {
+            this.seasonRequestUpdater(media?.id, season.seasonNumber, true);
+          }
         }
       }
 
@@ -439,7 +530,16 @@ class BaseScanner<T> {
               )
             ? MediaStatus.PROCESSING
             : MediaStatus.UNKNOWN;
+
+        if (isAllStandardSeasons) {
+          this.requestUpdater(media.id, false);
+        }
+
+        if (isAll4kSeasons) {
+          this.requestUpdater(media.id, true);
+        }
         await mediaRepository.save(media);
+
         this.log(`Updating existing title: ${title}`);
       } else {
         const newMedia = new Media({
@@ -499,7 +599,16 @@ class BaseScanner<T> {
               ? MediaStatus.PROCESSING
               : MediaStatus.UNKNOWN,
         });
+
+        if (newMedia['status'] === MediaStatus.AVAILABLE) {
+          this.requestUpdater(newMedia.id, false);
+        }
+
+        if (newMedia['status4k'] === MediaStatus.AVAILABLE) {
+          this.requestUpdater(newMedia.id, true);
+        }
         await mediaRepository.save(newMedia);
+
         this.log(`Saved ${title}`);
       }
     });
diff --git a/server/routes/media.ts b/server/routes/media.ts
index 8f93116c..9987380d 100644
--- a/server/routes/media.ts
+++ b/server/routes/media.ts
@@ -1,7 +1,13 @@
 import TautulliAPI from '@server/api/tautulli';
-import { MediaStatus, MediaType } from '@server/constants/media';
+import {
+  MediaRequestStatus,
+  MediaStatus,
+  MediaType,
+} from '@server/constants/media';
 import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
+import MediaRequest from '@server/entity/MediaRequest';
+import SeasonRequest from '@server/entity/SeasonRequest';
 import { User } from '@server/entity/User';
 import type {
   MediaResultsResponse,
@@ -98,6 +104,8 @@ mediaRoutes.post<
   isAuthenticated(Permission.MANAGE_REQUESTS),
   async (req, res, next) => {
     const mediaRepository = getRepository(Media);
+    const requestRepository = getRepository(MediaRequest);
+    const seasonRequestRepository = getRepository(SeasonRequest);
 
     const media = await mediaRepository.findOne({
       where: { id: Number(req.params.id) },
@@ -138,6 +146,26 @@ mediaRoutes.post<
         media.status = MediaStatus.UNKNOWN;
     }
 
+    if (req.params.status === 'available') {
+      const request = await requestRepository.findOne({
+        relations: {
+          media: true,
+        },
+        where: { media: { id: media.id }, is4k: is4k },
+      });
+
+      await requestRepository.update(
+        { media: { id: request?.id } },
+        { status: MediaRequestStatus.COMPLETED }
+      );
+
+      request?.seasons.forEach(async (season) => {
+        await seasonRequestRepository.update(season.id, {
+          status: MediaRequestStatus.COMPLETED,
+        });
+      });
+    }
+
     await mediaRepository.save(media);
 
     return res.status(200).json(media);

From 16677a4cdf421891c61f72089546b6a1fb118c0f Mon Sep 17 00:00:00 2001
From: Brandon <cohbrandon@gmail.com>
Date: Sat, 18 Mar 2023 19:41:47 -0400
Subject: [PATCH 03/13] fix: modified components to display deleted as a status

---
 overseerr-api.yml                             | 16 ++++++++--
 server/routes/request.ts                      |  9 ++++++
 .../Common/StatusBadgeMini/index.tsx          | 11 ++++++-
 .../Discover/RecentRequestsSlider/index.tsx   |  2 ++
 src/components/RequestBlock/index.tsx         |  5 +++
 src/components/RequestButton/index.tsx        |  8 +++--
 src/components/RequestList/index.tsx          |  8 +++++
 .../RequestModal/TvRequestModal.tsx           |  4 ++-
 src/components/StatusBadge/index.tsx          | 11 +++++++
 src/components/TvDetails/index.tsx            | 32 +++++++++++++++++++
 src/i18n/globalMessages.ts                    |  2 ++
 11 files changed, 101 insertions(+), 7 deletions(-)

diff --git a/overseerr-api.yml b/overseerr-api.yml
index 6e8f5896..4deaa981 100644
--- a/overseerr-api.yml
+++ b/overseerr-api.yml
@@ -1053,7 +1053,7 @@ components:
         status:
           type: number
           example: 0
-          description: Availability of the media. 1 = `UNKNOWN`, 2 = `PENDING`, 3 = `PROCESSING`, 4 = `PARTIALLY_AVAILABLE`, 5 = `AVAILABLE`
+          description: Availability of the media. 1 = `UNKNOWN`, 2 = `PENDING`, 3 = `PROCESSING`, 4 = `PARTIALLY_AVAILABLE`, 5 = `AVAILABLE`, 6 = `DELETED`
         requests:
           type: array
           readOnly: true
@@ -4955,6 +4955,7 @@ paths:
                 processing,
                 unavailable,
                 failed,
+                deleted,
               ]
         - in: query
           name: sort
@@ -5694,7 +5695,16 @@ paths:
           schema:
             type: string
             nullable: true
-            enum: [all, available, partial, allavailable, processing, pending]
+            enum:
+              [
+                all,
+                available,
+                partial,
+                allavailable,
+                processing,
+                pending,
+                deleted,
+              ]
         - in: query
           name: sort
           schema:
@@ -5753,7 +5763,7 @@ paths:
           example: available
           schema:
             type: string
-            enum: [available, partial, processing, pending, unknown]
+            enum: [available, partial, processing, pending, unknown, deleted]
       requestBody:
         content:
           application/json:
diff --git a/server/routes/request.ts b/server/routes/request.ts
index 83c05b48..1f8fcf66 100644
--- a/server/routes/request.ts
+++ b/server/routes/request.ts
@@ -55,12 +55,17 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
         case 'failed':
           statusFilter = [MediaRequestStatus.FAILED];
           break;
+        case 'completed':
+        case 'deleted':
+          statusFilter = [MediaRequestStatus.COMPLETED];
+          break;
         default:
           statusFilter = [
             MediaRequestStatus.PENDING,
             MediaRequestStatus.APPROVED,
             MediaRequestStatus.DECLINED,
             MediaRequestStatus.FAILED,
+            MediaRequestStatus.COMPLETED,
           ];
       }
 
@@ -79,6 +84,9 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
             MediaStatus.PARTIALLY_AVAILABLE,
           ];
           break;
+        case 'deleted':
+          mediaStatusFilter = [MediaStatus.DELETED];
+          break;
         default:
           mediaStatusFilter = [
             MediaStatus.UNKNOWN,
@@ -86,6 +94,7 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
             MediaStatus.PROCESSING,
             MediaStatus.PARTIALLY_AVAILABLE,
             MediaStatus.AVAILABLE,
+            MediaStatus.DELETED,
           ];
       }
 
diff --git a/src/components/Common/StatusBadgeMini/index.tsx b/src/components/Common/StatusBadgeMini/index.tsx
index a7e24a37..d98648a2 100644
--- a/src/components/Common/StatusBadgeMini/index.tsx
+++ b/src/components/Common/StatusBadgeMini/index.tsx
@@ -1,6 +1,11 @@
 import Spinner from '@app/assets/spinner.svg';
 import { CheckCircleIcon } from '@heroicons/react/20/solid';
-import { BellIcon, ClockIcon, MinusSmallIcon } from '@heroicons/react/24/solid';
+import {
+  BellIcon,
+  ClockIcon,
+  MinusSmallIcon,
+  TrashIcon,
+} from '@heroicons/react/24/solid';
 import { MediaStatus } from '@server/constants/media';
 
 interface StatusBadgeMiniProps {
@@ -50,6 +55,10 @@ const StatusBadgeMini = ({
       );
       indicatorIcon = <MinusSmallIcon />;
       break;
+    case MediaStatus.DELETED:
+      badgeStyle.push('bg-red-500 border-red-400 ring-red-400 text-red-100');
+      indicatorIcon = <TrashIcon />;
+      break;
   }
 
   if (inProgress) {
diff --git a/src/components/Discover/RecentRequestsSlider/index.tsx b/src/components/Discover/RecentRequestsSlider/index.tsx
index 96309d61..72909c8d 100644
--- a/src/components/Discover/RecentRequestsSlider/index.tsx
+++ b/src/components/Discover/RecentRequestsSlider/index.tsx
@@ -21,6 +21,8 @@ const RecentRequestsSlider = () => {
     return null;
   }
 
+  console.log({ requests });
+
   return (
     <>
       <div className="slider-header">
diff --git a/src/components/RequestBlock/index.tsx b/src/components/RequestBlock/index.tsx
index ca8cb5fa..8d3c7499 100644
--- a/src/components/RequestBlock/index.tsx
+++ b/src/components/RequestBlock/index.tsx
@@ -204,6 +204,11 @@ const RequestBlock = ({ request, onUpdate }: RequestBlockProps) => {
                   {intl.formatMessage(globalMessages.failed)}
                 </Badge>
               )}
+              {request.status === MediaRequestStatus.COMPLETED && (
+                <Badge badgeType="success">
+                  {intl.formatMessage(globalMessages.completed)}
+                </Badge>
+              )}
             </div>
           </div>
           <div className="mt-2 flex items-center text-sm leading-5 sm:mt-0">
diff --git a/src/components/RequestButton/index.tsx b/src/components/RequestButton/index.tsx
index 56e91810..b41a5fde 100644
--- a/src/components/RequestButton/index.tsx
+++ b/src/components/RequestButton/index.tsx
@@ -264,7 +264,9 @@ const RequestButton = ({
 
   // Standard request button
   if (
-    (!media || media.status === MediaStatus.UNKNOWN) &&
+    (!media ||
+      media.status === MediaStatus.UNKNOWN ||
+      media.status === MediaStatus.DELETED) &&
     hasPermission(
       [
         Permission.REQUEST,
@@ -307,7 +309,9 @@ const RequestButton = ({
 
   // 4K request button
   if (
-    (!media || media.status4k === MediaStatus.UNKNOWN) &&
+    (!media ||
+      media.status4k === MediaStatus.UNKNOWN ||
+      media.status4k === MediaStatus.DELETED) &&
     hasPermission(
       [
         Permission.REQUEST_4K,
diff --git a/src/components/RequestList/index.tsx b/src/components/RequestList/index.tsx
index bffd7c06..b01e36f5 100644
--- a/src/components/RequestList/index.tsx
+++ b/src/components/RequestList/index.tsx
@@ -34,6 +34,7 @@ enum Filter {
   AVAILABLE = 'available',
   UNAVAILABLE = 'unavailable',
   FAILED = 'failed',
+  DELETED = 'deleted',
 }
 
 type Sort = 'added' | 'modified';
@@ -99,6 +100,10 @@ const RequestList = () => {
     );
   }, [currentFilter, currentSort, currentPageSize]);
 
+  console.log({ currentFilter });
+
+  console.log({ data });
+
   if (!data && !error) {
     return <LoadingSpinner />;
   }
@@ -177,6 +182,9 @@ const RequestList = () => {
               <option value="unavailable">
                 {intl.formatMessage(globalMessages.unavailable)}
               </option>
+              <option value="deleted">
+                {intl.formatMessage(globalMessages.deleted)}
+              </option>
             </select>
           </div>
           <div className="mb-2 flex flex-grow sm:mb-0 lg:flex-grow-0">
diff --git a/src/components/RequestModal/TvRequestModal.tsx b/src/components/RequestModal/TvRequestModal.tsx
index 25c8fd3c..c0e2d4da 100644
--- a/src/components/RequestModal/TvRequestModal.tsx
+++ b/src/components/RequestModal/TvRequestModal.tsx
@@ -569,7 +569,9 @@ const TvRequestModal = ({
                         (sn) =>
                           sn.seasonNumber === season.seasonNumber &&
                           sn[is4k ? 'status4k' : 'status'] !==
-                            MediaStatus.UNKNOWN
+                            MediaStatus.UNKNOWN &&
+                          sn[is4k ? 'status4k' : 'status'] !==
+                            MediaStatus.DELETED
                       );
                       return (
                         <tr key={`season-${season.id}`}>
diff --git a/src/components/StatusBadge/index.tsx b/src/components/StatusBadge/index.tsx
index b60b7af0..cda8eb59 100644
--- a/src/components/StatusBadge/index.tsx
+++ b/src/components/StatusBadge/index.tsx
@@ -299,6 +299,17 @@ const StatusBadge = ({
         </Tooltip>
       );
 
+    case MediaStatus.DELETED:
+      return (
+        <Tooltip content={mediaLinkDescription}>
+          <Badge badgeType="danger">
+            {intl.formatMessage(is4k ? messages.status4k : messages.status, {
+              status: intl.formatMessage(globalMessages.deleted),
+            })}
+          </Badge>
+        </Tooltip>
+      );
+
     default:
       return null;
   }
diff --git a/src/components/TvDetails/index.tsx b/src/components/TvDetails/index.tsx
index 2f44a7d8..f9ece0fe 100644
--- a/src/components/TvDetails/index.tsx
+++ b/src/components/TvDetails/index.tsx
@@ -647,6 +647,18 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
                               </div>
                             </>
                           )}
+                          {mSeason?.status === MediaStatus.DELETED && (
+                            <>
+                              <div className="hidden md:flex">
+                                <Badge badgeType="danger">
+                                  {intl.formatMessage(globalMessages.deleted)}
+                                </Badge>
+                              </div>
+                              <div className="flex md:hidden">
+                                <StatusBadgeMini status={MediaStatus.DELETED} />
+                              </div>
+                            </>
+                          )}
                           {((!mSeason4k &&
                             request4k?.status ===
                               MediaRequestStatus.APPROVED) ||
@@ -733,6 +745,26 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
                                 </div>
                               </>
                             )}
+                          {mSeason4k?.status4k === MediaStatus.DELETED &&
+                            show4k && (
+                              <>
+                                <div className="hidden md:flex">
+                                  <Badge badgeType="danger">
+                                    {intl.formatMessage(messages.status4k, {
+                                      status: intl.formatMessage(
+                                        globalMessages.deleted
+                                      ),
+                                    })}
+                                  </Badge>
+                                </div>
+                                <div className="flex md:hidden">
+                                  <StatusBadgeMini
+                                    status={MediaStatus.DELETED}
+                                    is4k={true}
+                                  />
+                                </div>
+                              </>
+                            )}
                           <ChevronDownIcon
                             className={`${
                               open ? 'rotate-180' : ''
diff --git a/src/i18n/globalMessages.ts b/src/i18n/globalMessages.ts
index ca66a891..0ca61357 100644
--- a/src/i18n/globalMessages.ts
+++ b/src/i18n/globalMessages.ts
@@ -3,6 +3,7 @@ import { defineMessages } from 'react-intl';
 const globalMessages = defineMessages({
   available: 'Available',
   partiallyavailable: 'Partially Available',
+  deleted: 'Deleted',
   processing: 'Processing',
   unavailable: 'Unavailable',
   notrequested: 'Not Requested',
@@ -14,6 +15,7 @@ const globalMessages = defineMessages({
   pending: 'Pending',
   declined: 'Declined',
   approved: 'Approved',
+  completed: 'Completed',
   movie: 'Movie',
   movies: 'Movies',
   collection: 'Collection',

From 53c51d1837d2109344febc0a2cb6b88276b62216 Mon Sep 17 00:00:00 2001
From: Brandon <cohbrandon@gmail.com>
Date: Mon, 20 Mar 2023 23:35:32 -0400
Subject: [PATCH 04/13] fix: corrected media status switching away from deleted

---
 server/lib/scanners/baseScanner.ts            | 52 +++++++++++++------
 server/subscriber/MediaSubscriber.ts          |  8 ++-
 .../Discover/RecentRequestsSlider/index.tsx   |  2 -
 src/components/RequestList/index.tsx          |  4 --
 .../RequestModal/CollectionRequestModal.tsx   | 14 +++--
 .../RequestModal/TvRequestModal.tsx           | 10 ++--
 6 files changed, 61 insertions(+), 29 deletions(-)

diff --git a/server/lib/scanners/baseScanner.ts b/server/lib/scanners/baseScanner.ts
index 170ebee6..26f26daf 100644
--- a/server/lib/scanners/baseScanner.ts
+++ b/server/lib/scanners/baseScanner.ts
@@ -106,7 +106,7 @@ class BaseScanner<T> {
     });
 
     await requestRepository.update(
-      { media: { id: request?.id } },
+      { id: request?.id },
       { status: MediaRequestStatus.COMPLETED }
     );
   }
@@ -215,11 +215,11 @@ class BaseScanner<T> {
         }
 
         if (changedExisting) {
-          if (existing['status'] === MediaStatus.AVAILABLE) {
+          if (existing.status === MediaStatus.AVAILABLE) {
             this.requestUpdater(existing.id, false);
           }
 
-          if (existing['status4k'] === MediaStatus.AVAILABLE) {
+          if (existing.status4k === MediaStatus.AVAILABLE) {
             this.requestUpdater(existing.id, true);
           }
 
@@ -352,7 +352,9 @@ class BaseScanner<T> {
               ? MediaStatus.AVAILABLE
               : season.episodes > 0
               ? MediaStatus.PARTIALLY_AVAILABLE
-              : !season.is4kOverride && season.processing
+              : !season.is4kOverride &&
+                season.processing &&
+                existingSeason.status !== MediaStatus.DELETED
               ? MediaStatus.PROCESSING
               : existingSeason.status;
 
@@ -365,15 +367,25 @@ class BaseScanner<T> {
               ? MediaStatus.AVAILABLE
               : this.enable4kShow && season.episodes4k > 0
               ? MediaStatus.PARTIALLY_AVAILABLE
-              : season.is4kOverride && season.processing
+              : season.is4kOverride &&
+                season.processing &&
+                existingSeason.status !== MediaStatus.DELETED
               ? MediaStatus.PROCESSING
               : existingSeason.status4k;
 
-          if (existingSeason['status'] === MediaStatus.AVAILABLE) {
+          if (
+            (season.totalEpisodes === season.episodes && season.episodes > 0) ||
+            existingSeason.status === MediaStatus.AVAILABLE
+          ) {
             this.seasonRequestUpdater(media?.id, season.seasonNumber, false);
           }
 
-          if (existingSeason['status4k'] === MediaStatus.AVAILABLE) {
+          if (
+            (this.enable4kShow &&
+              season.episodes4k === season.totalEpisodes &&
+              season.episodes4k > 0) ||
+            existingSeason.status4k === MediaStatus.AVAILABLE
+          ) {
             this.seasonRequestUpdater(media?.id, season.seasonNumber, true);
           }
         } else {
@@ -492,12 +504,18 @@ class BaseScanner<T> {
         // the status
         const shouldStayAvailable =
           media.status === MediaStatus.AVAILABLE &&
-          newSeasons.filter((season) => season.status !== MediaStatus.UNKNOWN)
-            .length === 0;
+          newSeasons.filter(
+            (season) =>
+              season.status !== MediaStatus.UNKNOWN &&
+              season.status !== MediaStatus.DELETED
+          ).length === 0;
         const shouldStayAvailable4k =
           media.status4k === MediaStatus.AVAILABLE &&
-          newSeasons.filter((season) => season.status4k !== MediaStatus.UNKNOWN)
-            .length === 0;
+          newSeasons.filter(
+            (season) =>
+              season.status4k !== MediaStatus.UNKNOWN &&
+              season.status4k !== MediaStatus.DELETED
+          ).length === 0;
 
         media.status =
           isAllStandardSeasons || shouldStayAvailable
@@ -508,11 +526,13 @@ class BaseScanner<T> {
                   season.status === MediaStatus.AVAILABLE
               )
             ? MediaStatus.PARTIALLY_AVAILABLE
-            : !seasons.length ||
+            : (!seasons.length && media.status !== MediaStatus.DELETED) ||
               media.seasons.some(
                 (season) => season.status === MediaStatus.PROCESSING
               )
             ? MediaStatus.PROCESSING
+            : media.status === MediaStatus.DELETED
+            ? MediaStatus.DELETED
             : MediaStatus.UNKNOWN;
         media.status4k =
           (isAll4kSeasons || shouldStayAvailable4k) && this.enable4kShow
@@ -524,11 +544,13 @@ class BaseScanner<T> {
                   season.status4k === MediaStatus.AVAILABLE
               )
             ? MediaStatus.PARTIALLY_AVAILABLE
-            : !seasons.length ||
+            : (!seasons.length && media.status4k !== MediaStatus.DELETED) ||
               media.seasons.some(
                 (season) => season.status4k === MediaStatus.PROCESSING
               )
             ? MediaStatus.PROCESSING
+            : media.status4k === MediaStatus.DELETED
+            ? MediaStatus.DELETED
             : MediaStatus.UNKNOWN;
 
         if (isAllStandardSeasons) {
@@ -600,11 +622,11 @@ class BaseScanner<T> {
               : MediaStatus.UNKNOWN,
         });
 
-        if (newMedia['status'] === MediaStatus.AVAILABLE) {
+        if (isAllStandardSeasons) {
           this.requestUpdater(newMedia.id, false);
         }
 
-        if (newMedia['status4k'] === MediaStatus.AVAILABLE) {
+        if (isAll4kSeasons && this.enable4kShow) {
           this.requestUpdater(newMedia.id, true);
         }
         await mediaRepository.save(newMedia);
diff --git a/server/subscriber/MediaSubscriber.ts b/server/subscriber/MediaSubscriber.ts
index eecfe6f3..cc6444ad 100644
--- a/server/subscriber/MediaSubscriber.ts
+++ b/server/subscriber/MediaSubscriber.ts
@@ -33,7 +33,9 @@ export class MediaSubscriber implements EntitySubscriberInterface<Media> {
               id: entity.id,
             },
             is4k,
-            status: Not(MediaRequestStatus.DECLINED),
+            status: Not(
+              MediaRequestStatus.DECLINED && MediaRequestStatus.COMPLETED
+            ),
           },
         });
 
@@ -116,7 +118,9 @@ export class MediaSubscriber implements EntitySubscriberInterface<Media> {
               id: entity.id,
             },
             is4k,
-            status: Not(MediaRequestStatus.DECLINED),
+            status: Not(
+              MediaRequestStatus.DECLINED && MediaRequestStatus.COMPLETED
+            ),
           },
         });
         const request = requests.find(
diff --git a/src/components/Discover/RecentRequestsSlider/index.tsx b/src/components/Discover/RecentRequestsSlider/index.tsx
index 72909c8d..96309d61 100644
--- a/src/components/Discover/RecentRequestsSlider/index.tsx
+++ b/src/components/Discover/RecentRequestsSlider/index.tsx
@@ -21,8 +21,6 @@ const RecentRequestsSlider = () => {
     return null;
   }
 
-  console.log({ requests });
-
   return (
     <>
       <div className="slider-header">
diff --git a/src/components/RequestList/index.tsx b/src/components/RequestList/index.tsx
index b01e36f5..1d464ce1 100644
--- a/src/components/RequestList/index.tsx
+++ b/src/components/RequestList/index.tsx
@@ -100,10 +100,6 @@ const RequestList = () => {
     );
   }, [currentFilter, currentSort, currentPageSize]);
 
-  console.log({ currentFilter });
-
-  console.log({ data });
-
   if (!data && !error) {
     return <LoadingSpinner />;
   }
diff --git a/src/components/RequestModal/CollectionRequestModal.tsx b/src/components/RequestModal/CollectionRequestModal.tsx
index 614a00da..75d7b8f4 100644
--- a/src/components/RequestModal/CollectionRequestModal.tsx
+++ b/src/components/RequestModal/CollectionRequestModal.tsx
@@ -78,7 +78,8 @@ const CollectionRequestModal = ({
             .filter(
               (request) =>
                 request.is4k === is4k &&
-                request.status !== MediaRequestStatus.DECLINED
+                request.status !== MediaRequestStatus.DECLINED &&
+                request.status !== MediaRequestStatus.COMPLETED
             )
             .map((part) => part.id),
         ];
@@ -167,7 +168,9 @@ const CollectionRequestModal = ({
 
     return (part?.mediaInfo?.requests ?? []).find(
       (request) =>
-        request.is4k === is4k && request.status !== MediaRequestStatus.DECLINED
+        request.is4k === is4k &&
+        request.status !== MediaRequestStatus.DECLINED &&
+        request.status !== MediaRequestStatus.COMPLETED
     );
   };
 
@@ -241,6 +244,9 @@ const CollectionRequestModal = ({
     { type: 'or' }
   );
 
+  console.log('getALL', getAllRequestedParts().includes(8011));
+  console.log('getPART', getPartRequest(8011));
+
   return (
     <Modal
       loading={(!data && !error) || !quota}
@@ -342,7 +348,9 @@ const CollectionRequestModal = ({
                     const partMedia =
                       part.mediaInfo &&
                       part.mediaInfo[is4k ? 'status4k' : 'status'] !==
-                        MediaStatus.UNKNOWN
+                        MediaStatus.UNKNOWN &&
+                      part.mediaInfo[is4k ? 'status4k' : 'status'] !==
+                        MediaStatus.DELETED
                         ? part.mediaInfo
                         : undefined;
 
diff --git a/src/components/RequestModal/TvRequestModal.tsx b/src/components/RequestModal/TvRequestModal.tsx
index c0e2d4da..0e74e44d 100644
--- a/src/components/RequestModal/TvRequestModal.tsx
+++ b/src/components/RequestModal/TvRequestModal.tsx
@@ -243,7 +243,8 @@ const TvRequestModal = ({
       .filter(
         (request) =>
           request.is4k === is4k &&
-          request.status !== MediaRequestStatus.DECLINED
+          request.status !== MediaRequestStatus.DECLINED &&
+          request.status !== MediaRequestStatus.COMPLETED
       )
       .reduce((requestedSeasons, request) => {
         return [
@@ -341,7 +342,8 @@ const TvRequestModal = ({
       (data.mediaInfo.requests || []).filter(
         (request) =>
           request.is4k === is4k &&
-          request.status !== MediaRequestStatus.DECLINED
+          request.status !== MediaRequestStatus.DECLINED &&
+          request.status !== MediaRequestStatus.COMPLETED
       ).length > 0
     ) {
       data.mediaInfo.requests
@@ -349,7 +351,9 @@ const TvRequestModal = ({
         .forEach((request) => {
           if (!seasonRequest) {
             seasonRequest = request.seasons.find(
-              (season) => season.seasonNumber === seasonNumber
+              (season) =>
+                season.seasonNumber === seasonNumber &&
+                season.status !== MediaRequestStatus.COMPLETED
             );
           }
         });

From af6c88b5e3001478554ae53fc5b87fa1ce3924c2 Mon Sep 17 00:00:00 2001
From: Brandon <cohbrandon@gmail.com>
Date: Sat, 18 Mar 2023 19:41:47 -0400
Subject: [PATCH 05/13] fix: modified components to display deleted as a status

---
 src/components/Discover/RecentRequestsSlider/index.tsx | 2 ++
 src/components/RequestList/index.tsx                   | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/src/components/Discover/RecentRequestsSlider/index.tsx b/src/components/Discover/RecentRequestsSlider/index.tsx
index 96309d61..72909c8d 100644
--- a/src/components/Discover/RecentRequestsSlider/index.tsx
+++ b/src/components/Discover/RecentRequestsSlider/index.tsx
@@ -21,6 +21,8 @@ const RecentRequestsSlider = () => {
     return null;
   }
 
+  console.log({ requests });
+
   return (
     <>
       <div className="slider-header">
diff --git a/src/components/RequestList/index.tsx b/src/components/RequestList/index.tsx
index 1d464ce1..b01e36f5 100644
--- a/src/components/RequestList/index.tsx
+++ b/src/components/RequestList/index.tsx
@@ -100,6 +100,10 @@ const RequestList = () => {
     );
   }, [currentFilter, currentSort, currentPageSize]);
 
+  console.log({ currentFilter });
+
+  console.log({ data });
+
   if (!data && !error) {
     return <LoadingSpinner />;
   }

From ca01b60e5e0a63425348e2196567d2ded6ec6761 Mon Sep 17 00:00:00 2001
From: Brandon <cohbrandon@gmail.com>
Date: Thu, 11 May 2023 13:01:42 -0400
Subject: [PATCH 06/13] fix: corrected media status switching away from deleted

---
 src/components/Discover/RecentRequestsSlider/index.tsx | 2 --
 src/components/RequestList/index.tsx                   | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/src/components/Discover/RecentRequestsSlider/index.tsx b/src/components/Discover/RecentRequestsSlider/index.tsx
index 72909c8d..96309d61 100644
--- a/src/components/Discover/RecentRequestsSlider/index.tsx
+++ b/src/components/Discover/RecentRequestsSlider/index.tsx
@@ -21,8 +21,6 @@ const RecentRequestsSlider = () => {
     return null;
   }
 
-  console.log({ requests });
-
   return (
     <>
       <div className="slider-header">
diff --git a/src/components/RequestList/index.tsx b/src/components/RequestList/index.tsx
index b01e36f5..1d464ce1 100644
--- a/src/components/RequestList/index.tsx
+++ b/src/components/RequestList/index.tsx
@@ -100,10 +100,6 @@ const RequestList = () => {
     );
   }, [currentFilter, currentSort, currentPageSize]);
 
-  console.log({ currentFilter });
-
-  console.log({ data });
-
   if (!data && !error) {
     return <LoadingSpinner />;
   }

From 390000d6d45ff2c4f60476dab567645787ac9e5a Mon Sep 17 00:00:00 2001
From: Brandon <cohbrandon@gmail.com>
Date: Fri, 12 May 2023 11:52:30 -0400
Subject: [PATCH 07/13] fix: base scanner will set requests to completed
 correctly

---
 server/lib/availabilitySync.ts                |  1 +
 server/lib/scanners/baseScanner.ts            | 68 ++++++++++++++++---
 .../RequestModal/CollectionRequestModal.tsx   |  3 -
 3 files changed, 59 insertions(+), 13 deletions(-)

diff --git a/server/lib/availabilitySync.ts b/server/lib/availabilitySync.ts
index 398701bc..ea115c53 100644
--- a/server/lib/availabilitySync.ts
+++ b/server/lib/availabilitySync.ts
@@ -238,6 +238,7 @@ class AvailabilitySync {
         where: whereOptions,
         skip: offset,
         take: pageSize,
+        order: { id: 'DESC' },
       }));
       offset += pageSize;
     } while (mediaPage.length > 0);
diff --git a/server/lib/scanners/baseScanner.ts b/server/lib/scanners/baseScanner.ts
index 26f26daf..25d3898c 100644
--- a/server/lib/scanners/baseScanner.ts
+++ b/server/lib/scanners/baseScanner.ts
@@ -13,6 +13,7 @@ import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import AsyncLock from '@server/utils/asyncLock';
 import { randomUUID } from 'crypto';
+import { In } from 'typeorm';
 
 // Default scan rates (can be overidden)
 const BUNDLE_SIZE = 20;
@@ -98,17 +99,25 @@ class BaseScanner<T> {
   private async requestUpdater(mediaId: number, is4k: boolean) {
     const requestRepository = getRepository(MediaRequest);
 
-    const request = await requestRepository.findOne({
+    const request = await requestRepository.find({
       relations: {
         media: true,
       },
-      where: { media: { id: mediaId }, is4k: is4k },
+      where: {
+        media: { id: mediaId },
+        is4k: is4k,
+        status: MediaRequestStatus.APPROVED,
+      },
     });
 
-    await requestRepository.update(
-      { id: request?.id },
-      { status: MediaRequestStatus.COMPLETED }
-    );
+    const requestIds = request.map((request) => request.id);
+
+    if (requestIds.length > 0) {
+      await requestRepository.update(
+        { id: In(requestIds) },
+        { status: MediaRequestStatus.COMPLETED }
+      );
+    }
   }
 
   private async seasonRequestUpdater(
@@ -369,7 +378,7 @@ class BaseScanner<T> {
               ? MediaStatus.PARTIALLY_AVAILABLE
               : season.is4kOverride &&
                 season.processing &&
-                existingSeason.status !== MediaStatus.DELETED
+                existingSeason.status4k !== MediaStatus.DELETED
               ? MediaStatus.PROCESSING
               : existingSeason.status4k;
 
@@ -516,7 +525,6 @@ class BaseScanner<T> {
               season.status4k !== MediaStatus.UNKNOWN &&
               season.status4k !== MediaStatus.DELETED
           ).length === 0;
-
         media.status =
           isAllStandardSeasons || shouldStayAvailable
             ? MediaStatus.AVAILABLE
@@ -553,11 +561,51 @@ class BaseScanner<T> {
             ? MediaStatus.DELETED
             : MediaStatus.UNKNOWN;
 
-        if (isAllStandardSeasons) {
+        const seasonsCompleted =
+          seasons.length &&
+          seasons.filter(
+            (season) =>
+              season.episodes === season.totalEpisodes && season.episodes > 0
+          ).length;
+
+        const seasonsCompleted4k =
+          seasons.length &&
+          seasons.filter(
+            (season) =>
+              season.episodes4k === season.totalEpisodes &&
+              season.episodes4k > 0
+          ).length;
+
+        const seasonRequestRepository = getRepository(SeasonRequest);
+
+        const seasonRequestsCompleted = await seasonRequestRepository.find({
+          relations: {
+            request: {
+              media: true,
+            },
+          },
+          where: {
+            request: {
+              is4k: is4k,
+              media: {
+                id: media.id,
+              },
+            },
+            status: MediaRequestStatus.COMPLETED,
+          },
+        });
+
+        if (
+          seasonsCompleted === seasonRequestsCompleted.length &&
+          seasonRequestsCompleted.length > 0
+        ) {
           this.requestUpdater(media.id, false);
         }
 
-        if (isAll4kSeasons) {
+        if (
+          seasonsCompleted4k === seasonRequestsCompleted.length &&
+          seasonRequestsCompleted.length > 0
+        ) {
           this.requestUpdater(media.id, true);
         }
         await mediaRepository.save(media);
diff --git a/src/components/RequestModal/CollectionRequestModal.tsx b/src/components/RequestModal/CollectionRequestModal.tsx
index 75d7b8f4..b650d07d 100644
--- a/src/components/RequestModal/CollectionRequestModal.tsx
+++ b/src/components/RequestModal/CollectionRequestModal.tsx
@@ -244,9 +244,6 @@ const CollectionRequestModal = ({
     { type: 'or' }
   );
 
-  console.log('getALL', getAllRequestedParts().includes(8011));
-  console.log('getPART', getPartRequest(8011));
-
   return (
     <Modal
       loading={(!data && !error) || !quota}

From d5e3f1cd0b57086dd48809080cfba318d6dfcde6 Mon Sep 17 00:00:00 2001
From: Brandon <cohbrandon@gmail.com>
Date: Fri, 12 May 2023 18:42:54 -0400
Subject: [PATCH 08/13] fix: mark available button correctly sets requests as
 completed

---
 server/lib/availabilitySync.ts |  1 -
 server/routes/media.ts         | 24 +++++++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/server/lib/availabilitySync.ts b/server/lib/availabilitySync.ts
index ea115c53..398701bc 100644
--- a/server/lib/availabilitySync.ts
+++ b/server/lib/availabilitySync.ts
@@ -238,7 +238,6 @@ class AvailabilitySync {
         where: whereOptions,
         skip: offset,
         take: pageSize,
-        order: { id: 'DESC' },
       }));
       offset += pageSize;
     } while (mediaPage.length > 0);
diff --git a/server/routes/media.ts b/server/routes/media.ts
index 9987380d..ee0bc4f4 100644
--- a/server/routes/media.ts
+++ b/server/routes/media.ts
@@ -147,23 +147,29 @@ mediaRoutes.post<
     }
 
     if (req.params.status === 'available') {
-      const request = await requestRepository.findOne({
+      const requests = await requestRepository.find({
         relations: {
           media: true,
         },
         where: { media: { id: media.id }, is4k: is4k },
       });
 
-      await requestRepository.update(
-        { media: { id: request?.id } },
-        { status: MediaRequestStatus.COMPLETED }
-      );
+      const requestIds = requests.map((request) => request.id);
 
-      request?.seasons.forEach(async (season) => {
-        await seasonRequestRepository.update(season.id, {
-          status: MediaRequestStatus.COMPLETED,
+      if (requestIds.length > 0) {
+        await requestRepository.update(
+          { id: In(requestIds) },
+          { status: MediaRequestStatus.COMPLETED }
+        );
+      }
+
+      requests
+        .flatMap((request) => request.seasons)
+        .forEach(async (season) => {
+          await seasonRequestRepository.update(season.id, {
+            status: MediaRequestStatus.COMPLETED,
+          });
         });
-      });
     }
 
     await mediaRepository.save(media);

From 5c3ea9b03625d3663205e8d561313b2fe22bb1d2 Mon Sep 17 00:00:00 2001
From: Brandon Cohen <brandon@z3hn.dev>
Date: Sun, 14 May 2023 22:53:12 -0400
Subject: [PATCH 09/13] fix: status will now stay deleted after declined
 request

---
 server/entity/MediaRequest.ts                    | 16 +++++++++++-----
 server/routes/request.ts                         |  3 ++-
 src/components/RequestButton/index.tsx           |  4 ++--
 src/components/RequestCard/index.tsx             | 11 ++++++++++-
 src/components/RequestList/RequestItem/index.tsx | 11 ++++++++++-
 src/components/TitleCard/index.tsx               | 11 ++++++++---
 src/components/TvDetails/index.tsx               |  3 ++-
 7 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/server/entity/MediaRequest.ts b/server/entity/MediaRequest.ts
index ba67ab7b..4597b3ed 100644
--- a/server/entity/MediaRequest.ts
+++ b/server/entity/MediaRequest.ts
@@ -167,7 +167,8 @@ export class MediaRequest {
       // If there is an existing movie request that isn't declined, don't allow a new one.
       if (
         requestBody.mediaType === MediaType.MOVIE &&
-        existing[0].status !== MediaRequestStatus.DECLINED
+        existing[0].status !== MediaRequestStatus.DECLINED &&
+        existing[0].status !== MediaRequestStatus.COMPLETED
       ) {
         logger.warn('Duplicate request for media blocked', {
           tmdbId: tmdbMedia.id,
@@ -260,7 +261,8 @@ export class MediaRequest {
           .filter(
             (request) =>
               request.is4k === requestBody.is4k &&
-              request.status !== MediaRequestStatus.DECLINED
+              request.status !== MediaRequestStatus.DECLINED &&
+              request.status !== MediaRequestStatus.COMPLETED
           )
           .reduce((seasons, request) => {
             const combinedSeasons = request.seasons.map(
@@ -279,7 +281,9 @@ export class MediaRequest {
             .filter(
               (season) =>
                 season[requestBody.is4k ? 'status4k' : 'status'] !==
-                MediaStatus.UNKNOWN
+                  MediaStatus.UNKNOWN &&
+                season[requestBody.is4k ? 'status4k' : 'status'] !==
+                  MediaStatus.DELETED
             )
             .map((season) => season.seasonNumber),
         ];
@@ -583,7 +587,8 @@ export class MediaRequest {
 
     if (
       media.mediaType === MediaType.MOVIE &&
-      this.status === MediaRequestStatus.DECLINED
+      this.status === MediaRequestStatus.DECLINED &&
+      media[this.is4k ? 'status4k' : 'status'] !== MediaStatus.DELETED
     ) {
       media[this.is4k ? 'status4k' : 'status'] = MediaStatus.UNKNOWN;
       mediaRepository.save(media);
@@ -601,7 +606,8 @@ export class MediaRequest {
       media.requests.filter(
         (request) => request.status === MediaRequestStatus.PENDING
       ).length === 0 &&
-      media[this.is4k ? 'status4k' : 'status'] === MediaStatus.PENDING
+      media[this.is4k ? 'status4k' : 'status'] === MediaStatus.PENDING &&
+      media[this.is4k ? 'status4k' : 'status'] !== MediaStatus.DELETED
     ) {
       media[this.is4k ? 'status4k' : 'status'] = MediaStatus.UNKNOWN;
       mediaRepository.save(media);
diff --git a/server/routes/request.ts b/server/routes/request.ts
index 1f8fcf66..18cb6458 100644
--- a/server/routes/request.ts
+++ b/server/routes/request.ts
@@ -400,7 +400,8 @@ requestRoutes.put<{ requestId: string }>(
             (r) =>
               r.is4k === request.is4k &&
               r.id !== request.id &&
-              r.status !== MediaRequestStatus.DECLINED
+              r.status !== MediaRequestStatus.DECLINED &&
+              r.status !== MediaRequestStatus.COMPLETED
           )
           .reduce((seasons, r) => {
             const combinedSeasons = r.seasons.map(
diff --git a/src/components/RequestButton/index.tsx b/src/components/RequestButton/index.tsx
index b41a5fde..c614b5d8 100644
--- a/src/components/RequestButton/index.tsx
+++ b/src/components/RequestButton/index.tsx
@@ -266,7 +266,7 @@ const RequestButton = ({
   if (
     (!media ||
       media.status === MediaStatus.UNKNOWN ||
-      media.status === MediaStatus.DELETED) &&
+      (media.status === MediaStatus.DELETED && !activeRequest)) &&
     hasPermission(
       [
         Permission.REQUEST,
@@ -311,7 +311,7 @@ const RequestButton = ({
   if (
     (!media ||
       media.status4k === MediaStatus.UNKNOWN ||
-      media.status4k === MediaStatus.DELETED) &&
+      (media.status4k === MediaStatus.DELETED && !active4kRequest)) &&
     hasPermission(
       [
         Permission.REQUEST_4K,
diff --git a/src/components/RequestCard/index.tsx b/src/components/RequestCard/index.tsx
index 44abd555..b934e907 100644
--- a/src/components/RequestCard/index.tsx
+++ b/src/components/RequestCard/index.tsx
@@ -16,7 +16,7 @@ import {
   TrashIcon,
   XMarkIcon,
 } from '@heroicons/react/24/solid';
-import { MediaRequestStatus } from '@server/constants/media';
+import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
@@ -411,6 +411,15 @@ const RequestCard = ({ request, onTitleData }: RequestCardProps) => {
               >
                 {intl.formatMessage(globalMessages.failed)}
               </Badge>
+            ) : requestData.status === MediaRequestStatus.PENDING &&
+              requestData.media[requestData.is4k ? 'status4k' : 'status'] ===
+                MediaStatus.DELETED ? (
+              <Badge
+                badgeType="warning"
+                href={`/${requestData.type}/${requestData.media.tmdbId}?manage=1`}
+              >
+                {intl.formatMessage(globalMessages.pending)}
+              </Badge>
             ) : (
               <StatusBadge
                 status={
diff --git a/src/components/RequestList/RequestItem/index.tsx b/src/components/RequestList/RequestItem/index.tsx
index a42483ab..ea96a84d 100644
--- a/src/components/RequestList/RequestItem/index.tsx
+++ b/src/components/RequestList/RequestItem/index.tsx
@@ -15,7 +15,7 @@ import {
   TrashIcon,
   XMarkIcon,
 } from '@heroicons/react/24/solid';
-import { MediaRequestStatus } from '@server/constants/media';
+import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
 import type { MediaRequest } from '@server/entity/MediaRequest';
 import type { MovieDetails } from '@server/models/Movie';
 import type { TvDetails } from '@server/models/Tv';
@@ -474,6 +474,15 @@ const RequestItem = ({ request, revalidateList }: RequestItemProps) => {
                 >
                   {intl.formatMessage(globalMessages.failed)}
                 </Badge>
+              ) : requestData.status === MediaRequestStatus.PENDING &&
+                requestData.media[requestData.is4k ? 'status4k' : 'status'] ===
+                  MediaStatus.DELETED ? (
+                <Badge
+                  badgeType="warning"
+                  href={`/${requestData.type}/${requestData.media.tmdbId}?manage=1`}
+                >
+                  {intl.formatMessage(globalMessages.pending)}
+                </Badge>
               ) : (
                 <StatusBadge
                   status={
diff --git a/src/components/TitleCard/index.tsx b/src/components/TitleCard/index.tsx
index 9056fd57..8adc98d0 100644
--- a/src/components/TitleCard/index.tsx
+++ b/src/components/TitleCard/index.tsx
@@ -207,7 +207,9 @@ const TitleCard = ({
                     <div
                       className={`px-2 text-white ${
                         !showRequestButton ||
-                        (currentStatus && currentStatus !== MediaStatus.UNKNOWN)
+                        (currentStatus &&
+                          currentStatus !== MediaStatus.UNKNOWN &&
+                          currentStatus !== MediaStatus.DELETED)
                           ? 'pb-2'
                           : 'pb-11'
                       }`}
@@ -235,7 +237,8 @@ const TitleCard = ({
                           WebkitLineClamp:
                             !showRequestButton ||
                             (currentStatus &&
-                              currentStatus !== MediaStatus.UNKNOWN)
+                              currentStatus !== MediaStatus.UNKNOWN &&
+                              currentStatus !== MediaStatus.DELETED)
                               ? 5
                               : 3,
                           display: '-webkit-box',
@@ -253,7 +256,9 @@ const TitleCard = ({
 
               <div className="absolute bottom-0 left-0 right-0 flex justify-between px-2 py-2">
                 {showRequestButton &&
-                  (!currentStatus || currentStatus === MediaStatus.UNKNOWN) && (
+                  (!currentStatus ||
+                    currentStatus === MediaStatus.UNKNOWN ||
+                    currentStatus === MediaStatus.DELETED) && (
                     <Button
                       buttonType="primary"
                       buttonSize="sm"
diff --git a/src/components/TvDetails/index.tsx b/src/components/TvDetails/index.tsx
index f9ece0fe..2cfabaa8 100644
--- a/src/components/TvDetails/index.tsx
+++ b/src/components/TvDetails/index.tsx
@@ -234,7 +234,8 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
       .filter(
         (request) =>
           request.is4k === is4k &&
-          request.status !== MediaRequestStatus.DECLINED
+          request.status !== MediaRequestStatus.DECLINED &&
+          request.status !== MediaRequestStatus.COMPLETED
       )
       .reduce((requestedSeasons, request) => {
         return [

From 82bf2aa4df74790c40befbe9622f6761e7cf3f4f Mon Sep 17 00:00:00 2001
From: Brandon Cohen <brandon@z3hn.dev>
Date: Fri, 19 May 2023 17:01:10 -0400
Subject: [PATCH 10/13] refactor: request completion handling moved to entity

---
 server/entity/Media.ts               |  35 +++++-
 server/entity/Season.ts              |  34 +++++-
 server/entity/SeasonRequest.ts       |  21 ++--
 server/lib/availabilitySync.ts       |   5 +-
 server/lib/scanners/baseScanner.ts   | 162 +--------------------------
 server/subscriber/MediaSubscriber.ts |  57 ++++------
 6 files changed, 106 insertions(+), 208 deletions(-)

diff --git a/server/entity/Media.ts b/server/entity/Media.ts
index 2d169172..d5c78874 100644
--- a/server/entity/Media.ts
+++ b/server/entity/Media.ts
@@ -1,6 +1,10 @@
 import RadarrAPI from '@server/api/servarr/radarr';
 import SonarrAPI from '@server/api/servarr/sonarr';
-import { MediaStatus, MediaType } from '@server/constants/media';
+import {
+  MediaRequestStatus,
+  MediaStatus,
+  MediaType,
+} from '@server/constants/media';
 import { getRepository } from '@server/datasource';
 import type { DownloadingItem } from '@server/lib/downloadtracker';
 import downloadTracker from '@server/lib/downloadtracker';
@@ -8,6 +12,7 @@ import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import {
   AfterLoad,
+  AfterUpdate,
   Column,
   CreateDateColumn,
   Entity,
@@ -309,6 +314,34 @@ class Media {
       }
     }
   }
+
+  @AfterUpdate()
+  public async updateRelatedMediaRequest(): Promise<void> {
+    const requestRepository = getRepository(MediaRequest);
+
+    const relatedRequests = await requestRepository.find({
+      relations: {
+        media: true,
+      },
+      where: {
+        media: { id: this.id },
+        status: MediaRequestStatus.APPROVED,
+      },
+    });
+
+    if (relatedRequests.length > 0) {
+      relatedRequests.forEach((request) => {
+        if (
+          this[request.is4k ? 'status4k' : 'status'] ===
+            MediaStatus.AVAILABLE ||
+          this[request.is4k ? 'status4k' : 'status'] === MediaStatus.DELETED
+        ) {
+          request.status = MediaRequestStatus.COMPLETED;
+        }
+      });
+      requestRepository.save(relatedRequests);
+    }
+  }
 }
 
 export default Media;
diff --git a/server/entity/Season.ts b/server/entity/Season.ts
index 44a83d97..993fcea1 100644
--- a/server/entity/Season.ts
+++ b/server/entity/Season.ts
@@ -1,5 +1,8 @@
-import { MediaStatus } from '@server/constants/media';
+import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
+import { getRepository } from '@server/datasource';
+import SeasonRequest from '@server/entity/SeasonRequest';
 import {
+  AfterUpdate,
   Column,
   CreateDateColumn,
   Entity,
@@ -35,6 +38,35 @@ class Season {
   constructor(init?: Partial<Season>) {
     Object.assign(this, init);
   }
+
+  @AfterUpdate()
+  public async updateSeasonRequests(): Promise<void> {
+    const seasonRequestRepository = getRepository(SeasonRequest);
+
+    const relatedSeasonRequests = await seasonRequestRepository.find({
+      relations: {
+        request: true,
+      },
+      where: {
+        request: { media: { id: (await this.media).id } },
+        seasonNumber: this.seasonNumber,
+      },
+    });
+
+    relatedSeasonRequests.forEach((seasonRequest) => {
+      if (
+        this.seasonNumber === seasonRequest.seasonNumber &&
+        ((!seasonRequest.request.is4k &&
+          (this.status === MediaStatus.AVAILABLE ||
+            this.status === MediaStatus.DELETED)) ||
+          (seasonRequest.request.is4k &&
+            this.status4k === MediaStatus.AVAILABLE) ||
+          this.status4k === MediaStatus.DELETED)
+      )
+        seasonRequest.status = MediaRequestStatus.COMPLETED;
+    });
+    seasonRequestRepository.save(relatedSeasonRequests);
+  }
 }
 
 export default Season;
diff --git a/server/entity/SeasonRequest.ts b/server/entity/SeasonRequest.ts
index 984c3d3b..c7144572 100644
--- a/server/entity/SeasonRequest.ts
+++ b/server/entity/SeasonRequest.ts
@@ -38,22 +38,21 @@ class SeasonRequest {
   }
 
   @AfterUpdate()
-  public async handleRemoveParent(): Promise<void> {
-    const mediaRequestRepository = getRepository(MediaRequest);
-    const requestToBeDeleted = await mediaRequestRepository.findOneOrFail({
+  public async updateMediaRequests(): Promise<void> {
+    const requestRepository = getRepository(MediaRequest);
+
+    const relatedRequest = await requestRepository.findOne({
       where: { id: this.request.id },
     });
 
-    const allSeasonsAreCompleted = requestToBeDeleted.seasons.filter(
-      (season) => {
-        return season.status === MediaRequestStatus.COMPLETED;
-      }
+    const isRequestComplete = relatedRequest?.seasons.every(
+      (seasonRequest) => seasonRequest.status === MediaRequestStatus.COMPLETED
     );
 
-    if (requestToBeDeleted.seasons.length === allSeasonsAreCompleted.length) {
-      await mediaRequestRepository.update(this.request.id, {
-        status: MediaRequestStatus.COMPLETED,
-      });
+    if (isRequestComplete && relatedRequest) {
+      relatedRequest.status = MediaRequestStatus.COMPLETED;
+
+      requestRepository.save(relatedRequest);
     }
   }
 }
diff --git a/server/lib/availabilitySync.ts b/server/lib/availabilitySync.ts
index 398701bc..4b191300 100644
--- a/server/lib/availabilitySync.ts
+++ b/server/lib/availabilitySync.ts
@@ -3,7 +3,7 @@ import PlexAPI from '@server/api/plexapi';
 import RadarrAPI, { type RadarrMovie } from '@server/api/servarr/radarr';
 import type { SonarrSeason, SonarrSeries } from '@server/api/servarr/sonarr';
 import SonarrAPI from '@server/api/servarr/sonarr';
-import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
+import { MediaStatus } from '@server/constants/media';
 import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
 import MediaRequest from '@server/entity/MediaRequest';
@@ -203,6 +203,9 @@ class AvailabilitySync {
             await this.mediaUpdater(media, true);
           }
         }
+        if (!mediaExists || didDeleteSeasons) {
+          await mediaRepository.save(media);
+        }
       }
     } catch (ex) {
       logger.error('Failed to complete availability sync.', {
diff --git a/server/lib/scanners/baseScanner.ts b/server/lib/scanners/baseScanner.ts
index 25d3898c..439174f7 100644
--- a/server/lib/scanners/baseScanner.ts
+++ b/server/lib/scanners/baseScanner.ts
@@ -1,19 +1,12 @@
 import TheMovieDb from '@server/api/themoviedb';
-import {
-  MediaRequestStatus,
-  MediaStatus,
-  MediaType,
-} from '@server/constants/media';
+import { MediaStatus, MediaType } from '@server/constants/media';
 import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
-import MediaRequest from '@server/entity/MediaRequest';
 import Season from '@server/entity/Season';
-import SeasonRequest from '@server/entity/SeasonRequest';
 import { getSettings } from '@server/lib/settings';
 import logger from '@server/logger';
 import AsyncLock from '@server/utils/asyncLock';
 import { randomUUID } from 'crypto';
-import { In } from 'typeorm';
 
 // Default scan rates (can be overidden)
 const BUNDLE_SIZE = 20;
@@ -96,61 +89,6 @@ class BaseScanner<T> {
     return existing;
   }
 
-  private async requestUpdater(mediaId: number, is4k: boolean) {
-    const requestRepository = getRepository(MediaRequest);
-
-    const request = await requestRepository.find({
-      relations: {
-        media: true,
-      },
-      where: {
-        media: { id: mediaId },
-        is4k: is4k,
-        status: MediaRequestStatus.APPROVED,
-      },
-    });
-
-    const requestIds = request.map((request) => request.id);
-
-    if (requestIds.length > 0) {
-      await requestRepository.update(
-        { id: In(requestIds) },
-        { status: MediaRequestStatus.COMPLETED }
-      );
-    }
-  }
-
-  private async seasonRequestUpdater(
-    mediaId: number | undefined,
-    seasonNumber: number,
-    is4k: boolean
-  ) {
-    const seasonRequestRepository = getRepository(SeasonRequest);
-
-    const seasonToBeCompleted = await seasonRequestRepository.findOne({
-      relations: {
-        request: {
-          media: true,
-        },
-      },
-      where: {
-        request: {
-          is4k: is4k,
-          media: {
-            id: mediaId,
-          },
-        },
-        seasonNumber: seasonNumber,
-      },
-    });
-
-    if (seasonToBeCompleted) {
-      await seasonRequestRepository.update(seasonToBeCompleted?.id, {
-        status: MediaRequestStatus.COMPLETED,
-      });
-    }
-  }
-
   protected async processMovie(
     tmdbId: number,
     {
@@ -224,14 +162,6 @@ class BaseScanner<T> {
         }
 
         if (changedExisting) {
-          if (existing.status === MediaStatus.AVAILABLE) {
-            this.requestUpdater(existing.id, false);
-          }
-
-          if (existing.status4k === MediaStatus.AVAILABLE) {
-            this.requestUpdater(existing.id, true);
-          }
-
           await mediaRepository.save(existing);
 
           this.log(
@@ -275,14 +205,6 @@ class BaseScanner<T> {
             is4k && this.enable4kMovie ? ratingKey : undefined;
         }
 
-        if (newMedia['status'] === MediaStatus.AVAILABLE) {
-          this.requestUpdater(newMedia.id, false);
-        }
-
-        if (newMedia['status4k'] === MediaStatus.AVAILABLE && existing) {
-          this.requestUpdater(newMedia.id, true);
-        }
-
         await mediaRepository.save(newMedia);
         this.log(`Saved new media: ${title}`);
       }
@@ -381,22 +303,6 @@ class BaseScanner<T> {
                 existingSeason.status4k !== MediaStatus.DELETED
               ? MediaStatus.PROCESSING
               : existingSeason.status4k;
-
-          if (
-            (season.totalEpisodes === season.episodes && season.episodes > 0) ||
-            existingSeason.status === MediaStatus.AVAILABLE
-          ) {
-            this.seasonRequestUpdater(media?.id, season.seasonNumber, false);
-          }
-
-          if (
-            (this.enable4kShow &&
-              season.episodes4k === season.totalEpisodes &&
-              season.episodes4k > 0) ||
-            existingSeason.status4k === MediaStatus.AVAILABLE
-          ) {
-            this.seasonRequestUpdater(media?.id, season.seasonNumber, true);
-          }
         } else {
           newSeasons.push(
             new Season({
@@ -421,18 +327,6 @@ class BaseScanner<T> {
                   : MediaStatus.UNKNOWN,
             })
           );
-
-          if (season.totalEpisodes === season.episodes && season.episodes > 0) {
-            this.seasonRequestUpdater(media?.id, season.seasonNumber, false);
-          }
-
-          if (
-            this.enable4kShow &&
-            season.totalEpisodes === season.episodes4k &&
-            season.episodes4k > 0
-          ) {
-            this.seasonRequestUpdater(media?.id, season.seasonNumber, true);
-          }
         }
       }
 
@@ -561,53 +455,6 @@ class BaseScanner<T> {
             ? MediaStatus.DELETED
             : MediaStatus.UNKNOWN;
 
-        const seasonsCompleted =
-          seasons.length &&
-          seasons.filter(
-            (season) =>
-              season.episodes === season.totalEpisodes && season.episodes > 0
-          ).length;
-
-        const seasonsCompleted4k =
-          seasons.length &&
-          seasons.filter(
-            (season) =>
-              season.episodes4k === season.totalEpisodes &&
-              season.episodes4k > 0
-          ).length;
-
-        const seasonRequestRepository = getRepository(SeasonRequest);
-
-        const seasonRequestsCompleted = await seasonRequestRepository.find({
-          relations: {
-            request: {
-              media: true,
-            },
-          },
-          where: {
-            request: {
-              is4k: is4k,
-              media: {
-                id: media.id,
-              },
-            },
-            status: MediaRequestStatus.COMPLETED,
-          },
-        });
-
-        if (
-          seasonsCompleted === seasonRequestsCompleted.length &&
-          seasonRequestsCompleted.length > 0
-        ) {
-          this.requestUpdater(media.id, false);
-        }
-
-        if (
-          seasonsCompleted4k === seasonRequestsCompleted.length &&
-          seasonRequestsCompleted.length > 0
-        ) {
-          this.requestUpdater(media.id, true);
-        }
         await mediaRepository.save(media);
 
         this.log(`Updating existing title: ${title}`);
@@ -670,13 +517,6 @@ class BaseScanner<T> {
               : MediaStatus.UNKNOWN,
         });
 
-        if (isAllStandardSeasons) {
-          this.requestUpdater(newMedia.id, false);
-        }
-
-        if (isAll4kSeasons && this.enable4kShow) {
-          this.requestUpdater(newMedia.id, true);
-        }
         await mediaRepository.save(newMedia);
 
         this.log(`Saved ${title}`);
diff --git a/server/subscriber/MediaSubscriber.ts b/server/subscriber/MediaSubscriber.ts
index cc6444ad..3e523250 100644
--- a/server/subscriber/MediaSubscriber.ts
+++ b/server/subscriber/MediaSubscriber.ts
@@ -12,7 +12,7 @@ import notificationManager, { Notification } from '@server/lib/notifications';
 import logger from '@server/logger';
 import { truncate } from 'lodash';
 import type { EntitySubscriberInterface, UpdateEvent } from 'typeorm';
-import { EventSubscriber, In, Not } from 'typeorm';
+import { EventSubscriber, In } from 'typeorm';
 
 @EventSubscriber()
 export class MediaSubscriber implements EntitySubscriberInterface<Media> {
@@ -27,47 +27,39 @@ export class MediaSubscriber implements EntitySubscriberInterface<Media> {
     ) {
       if (entity.mediaType === MediaType.MOVIE) {
         const requestRepository = getRepository(MediaRequest);
-        const relatedRequests = await requestRepository.find({
+        const relatedRequest = await requestRepository.findOne({
           where: {
             media: {
               id: entity.id,
             },
             is4k,
-            status: Not(
-              MediaRequestStatus.DECLINED && MediaRequestStatus.COMPLETED
-            ),
+            status: MediaRequestStatus.COMPLETED,
           },
+          order: { id: 'DESC' },
         });
 
-        if (relatedRequests.length > 0) {
-          const tmdb = new TheMovieDb();
+        const tmdb = new TheMovieDb();
 
+        if (relatedRequest) {
           try {
             const movie = await tmdb.getMovie({ movieId: entity.tmdbId });
 
-            relatedRequests.forEach((request) => {
-              notificationManager.sendNotification(
-                Notification.MEDIA_AVAILABLE,
-                {
-                  event: `${is4k ? '4K ' : ''}Movie Request Now Available`,
-                  notifyAdmin: false,
-                  notifySystem: true,
-                  notifyUser: request.requestedBy,
-                  subject: `${movie.title}${
-                    movie.release_date
-                      ? ` (${movie.release_date.slice(0, 4)})`
-                      : ''
-                  }`,
-                  message: truncate(movie.overview, {
-                    length: 500,
-                    separator: /\s/,
-                    omission: '…',
-                  }),
-                  media: entity,
-                  image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${movie.poster_path}`,
-                  request,
-                }
-              );
+            notificationManager.sendNotification(Notification.MEDIA_AVAILABLE, {
+              event: `${is4k ? '4K ' : ''}Movie Request Now Available`,
+              notifyAdmin: false,
+              notifySystem: true,
+              notifyUser: relatedRequest.requestedBy,
+              subject: `${movie.title}${
+                movie.release_date ? ` (${movie.release_date.slice(0, 4)})` : ''
+              }`,
+              message: truncate(movie.overview, {
+                length: 500,
+                separator: /\s/,
+                omission: '…',
+              }),
+              media: entity,
+              image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${movie.poster_path}`,
+              request: relatedRequest,
             });
           } catch (e) {
             logger.error('Something went wrong sending media notification(s)', {
@@ -118,10 +110,9 @@ export class MediaSubscriber implements EntitySubscriberInterface<Media> {
               id: entity.id,
             },
             is4k,
-            status: Not(
-              MediaRequestStatus.DECLINED && MediaRequestStatus.COMPLETED
-            ),
+            status: MediaRequestStatus.COMPLETED,
           },
+          order: { id: 'DESC' },
         });
         const request = requests.find(
           (request) =>

From 1cb691f9cdead48e6302526f214185ee6b8ff7f2 Mon Sep 17 00:00:00 2001
From: Brandon Cohen <brandon@z3hn.dev>
Date: Fri, 16 Jun 2023 18:31:26 -0400
Subject: [PATCH 11/13] fix: prevented notifications from sending to old
 deleted requests

---
 server/entity/Media.ts                      |   3 +
 server/entity/Season.ts                     |   2 +
 server/entity/SeasonRequest.ts              |   3 +
 server/lib/availabilitySync.ts              |   1 +
 server/lib/scanners/baseScanner.ts          |   6 -
 server/routes/media.ts                      |   3 +
 server/subscriber/MediaRequestSubscriber.ts | 128 ++++++++++++
 server/subscriber/MediaSubscriber.ts        | 212 +-------------------
 src/i18n/locale/en.json                     |   2 +
 9 files changed, 144 insertions(+), 216 deletions(-)
 create mode 100644 server/subscriber/MediaRequestSubscriber.ts

diff --git a/server/entity/Media.ts b/server/entity/Media.ts
index d5c78874..c7a3dccd 100644
--- a/server/entity/Media.ts
+++ b/server/entity/Media.ts
@@ -329,6 +329,9 @@ class Media {
       },
     });
 
+    // Check the media entity status and if
+    // available or deleted, set the related request
+    // to completed
     if (relatedRequests.length > 0) {
       relatedRequests.forEach((request) => {
         if (
diff --git a/server/entity/Season.ts b/server/entity/Season.ts
index 993fcea1..170f8a0d 100644
--- a/server/entity/Season.ts
+++ b/server/entity/Season.ts
@@ -53,6 +53,8 @@ class Season {
       },
     });
 
+    // Check seasons when/if they become available or deleted,
+    // then set the related season request to completed
     relatedSeasonRequests.forEach((seasonRequest) => {
       if (
         this.seasonNumber === seasonRequest.seasonNumber &&
diff --git a/server/entity/SeasonRequest.ts b/server/entity/SeasonRequest.ts
index c7144572..f2416ded 100644
--- a/server/entity/SeasonRequest.ts
+++ b/server/entity/SeasonRequest.ts
@@ -45,6 +45,9 @@ class SeasonRequest {
       where: { id: this.request.id },
     });
 
+    // Check the parent of the season request and
+    // if every season request is complete
+    // set the parent request to complete as well
     const isRequestComplete = relatedRequest?.seasons.every(
       (seasonRequest) => seasonRequest.status === MediaRequestStatus.COMPLETED
     );
diff --git a/server/lib/availabilitySync.ts b/server/lib/availabilitySync.ts
index 4b191300..bab387fb 100644
--- a/server/lib/availabilitySync.ts
+++ b/server/lib/availabilitySync.ts
@@ -725,4 +725,5 @@ class AvailabilitySync {
 }
 
 const availabilitySync = new AvailabilitySync();
+
 export default availabilitySync;
diff --git a/server/lib/scanners/baseScanner.ts b/server/lib/scanners/baseScanner.ts
index 439174f7..5ac83637 100644
--- a/server/lib/scanners/baseScanner.ts
+++ b/server/lib/scanners/baseScanner.ts
@@ -163,7 +163,6 @@ class BaseScanner<T> {
 
         if (changedExisting) {
           await mediaRepository.save(existing);
-
           this.log(
             `Media for ${title} exists. Changes were detected and the title will be updated.`,
             'info'
@@ -204,7 +203,6 @@ class BaseScanner<T> {
           newMedia.ratingKey4k =
             is4k && this.enable4kMovie ? ratingKey : undefined;
         }
-
         await mediaRepository.save(newMedia);
         this.log(`Saved new media: ${title}`);
       }
@@ -454,9 +452,7 @@ class BaseScanner<T> {
             : media.status4k === MediaStatus.DELETED
             ? MediaStatus.DELETED
             : MediaStatus.UNKNOWN;
-
         await mediaRepository.save(media);
-
         this.log(`Updating existing title: ${title}`);
       } else {
         const newMedia = new Media({
@@ -516,9 +512,7 @@ class BaseScanner<T> {
               ? MediaStatus.PROCESSING
               : MediaStatus.UNKNOWN,
         });
-
         await mediaRepository.save(newMedia);
-
         this.log(`Saved ${title}`);
       }
     });
diff --git a/server/routes/media.ts b/server/routes/media.ts
index ee0bc4f4..b0f684c5 100644
--- a/server/routes/media.ts
+++ b/server/routes/media.ts
@@ -147,6 +147,9 @@ mediaRoutes.post<
     }
 
     if (req.params.status === 'available') {
+      // Here we check all related media requests and
+      // then set to completed if the media is marked
+      // as available
       const requests = await requestRepository.find({
         relations: {
           media: true,
diff --git a/server/subscriber/MediaRequestSubscriber.ts b/server/subscriber/MediaRequestSubscriber.ts
new file mode 100644
index 00000000..cb63702a
--- /dev/null
+++ b/server/subscriber/MediaRequestSubscriber.ts
@@ -0,0 +1,128 @@
+import TheMovieDb from '@server/api/themoviedb';
+import {
+  MediaRequestStatus,
+  MediaStatus,
+  MediaType,
+} from '@server/constants/media';
+import { MediaRequest } from '@server/entity/MediaRequest';
+import notificationManager, { Notification } from '@server/lib/notifications';
+import logger from '@server/logger';
+import { truncate } from 'lodash';
+import type { EntitySubscriberInterface, UpdateEvent } from 'typeorm';
+import { EventSubscriber } from 'typeorm';
+
+@EventSubscriber()
+export class MediaRequestSubscriber
+  implements EntitySubscriberInterface<MediaRequest>
+{
+  private async notifyAvailableMovie(entity: MediaRequest) {
+    if (entity.media.status === MediaStatus.AVAILABLE) {
+      const tmdb = new TheMovieDb();
+
+      try {
+        const movie = await tmdb.getMovie({
+          movieId: entity.media.tmdbId,
+        });
+
+        notificationManager.sendNotification(Notification.MEDIA_AVAILABLE, {
+          event: `${entity.is4k ? '4K ' : ''}Movie Request Now Available`,
+          notifyAdmin: false,
+          notifySystem: true,
+          notifyUser: entity.requestedBy,
+          subject: `${movie.title}${
+            movie.release_date ? ` (${movie.release_date.slice(0, 4)})` : ''
+          }`,
+          message: truncate(movie.overview, {
+            length: 500,
+            separator: /\s/,
+            omission: '…',
+          }),
+          media: entity.media,
+          image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${movie.poster_path}`,
+          request: entity,
+        });
+      } catch (e) {
+        logger.error('Something went wrong sending media notification(s)', {
+          label: 'Notifications',
+          errorMessage: e.message,
+          mediaId: entity.id,
+        });
+      }
+    }
+  }
+
+  private async notifyAvailableSeries(entity: MediaRequest) {
+    // Find all seasons in the related media entity
+    // and see if they are available, then we can check
+    // if the request contains the same seasons
+    const isMediaAvailable = entity.media.seasons
+      .filter(
+        (season) =>
+          season[entity.is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE
+      )
+      .every((seasonRequest) =>
+        entity.seasons.find(
+          (season) => season.seasonNumber === seasonRequest.seasonNumber
+        )
+      );
+
+    if (entity.media.status === MediaStatus.AVAILABLE || isMediaAvailable) {
+      const tmdb = new TheMovieDb();
+
+      try {
+        const tv = await tmdb.getTvShow({ tvId: entity.media.tmdbId });
+
+        notificationManager.sendNotification(Notification.MEDIA_AVAILABLE, {
+          event: `${entity.is4k ? '4K ' : ''}Series Request Now Available`,
+          subject: `${tv.name}${
+            tv.first_air_date ? ` (${tv.first_air_date.slice(0, 4)})` : ''
+          }`,
+          message: truncate(tv.overview, {
+            length: 500,
+            separator: /\s/,
+            omission: '…',
+          }),
+          notifyAdmin: false,
+          notifySystem: true,
+          notifyUser: entity.requestedBy,
+          image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${tv.poster_path}`,
+          media: entity.media,
+          extra: [
+            {
+              name: 'Requested Seasons',
+              value: entity.seasons
+                .map((season) => season.seasonNumber)
+                .join(', '),
+            },
+          ],
+          request: entity,
+        });
+      } catch (e) {
+        logger.error('Something went wrong sending media notification(s)', {
+          label: 'Notifications',
+          errorMessage: e.message,
+          mediaId: entity.id,
+        });
+      }
+    }
+  }
+
+  public afterUpdate(event: UpdateEvent<MediaRequest>): void {
+    if (!event.entity) {
+      return;
+    }
+
+    if (event.entity.status === MediaRequestStatus.COMPLETED) {
+      if (event.entity.media.mediaType === MediaType.MOVIE) {
+        this.notifyAvailableMovie(event.entity as MediaRequest);
+      }
+      if (event.entity.media.mediaType === MediaType.TV) {
+        this.notifyAvailableSeries(event.entity as MediaRequest);
+      }
+    }
+  }
+
+  public listenTo(): typeof MediaRequest {
+    return MediaRequest;
+  }
+}
diff --git a/server/subscriber/MediaSubscriber.ts b/server/subscriber/MediaSubscriber.ts
index 3e523250..b73e4ecb 100644
--- a/server/subscriber/MediaSubscriber.ts
+++ b/server/subscriber/MediaSubscriber.ts
@@ -1,174 +1,12 @@
-import TheMovieDb from '@server/api/themoviedb';
-import {
-  MediaRequestStatus,
-  MediaStatus,
-  MediaType,
-} from '@server/constants/media';
+import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
 import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
 import { MediaRequest } from '@server/entity/MediaRequest';
-import Season from '@server/entity/Season';
-import notificationManager, { Notification } from '@server/lib/notifications';
-import logger from '@server/logger';
-import { truncate } from 'lodash';
 import type { EntitySubscriberInterface, UpdateEvent } from 'typeorm';
-import { EventSubscriber, In } from 'typeorm';
+import { EventSubscriber } from 'typeorm';
 
 @EventSubscriber()
 export class MediaSubscriber implements EntitySubscriberInterface<Media> {
-  private async notifyAvailableMovie(
-    entity: Media,
-    dbEntity: Media,
-    is4k: boolean
-  ) {
-    if (
-      entity[is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE &&
-      dbEntity[is4k ? 'status4k' : 'status'] !== MediaStatus.AVAILABLE
-    ) {
-      if (entity.mediaType === MediaType.MOVIE) {
-        const requestRepository = getRepository(MediaRequest);
-        const relatedRequest = await requestRepository.findOne({
-          where: {
-            media: {
-              id: entity.id,
-            },
-            is4k,
-            status: MediaRequestStatus.COMPLETED,
-          },
-          order: { id: 'DESC' },
-        });
-
-        const tmdb = new TheMovieDb();
-
-        if (relatedRequest) {
-          try {
-            const movie = await tmdb.getMovie({ movieId: entity.tmdbId });
-
-            notificationManager.sendNotification(Notification.MEDIA_AVAILABLE, {
-              event: `${is4k ? '4K ' : ''}Movie Request Now Available`,
-              notifyAdmin: false,
-              notifySystem: true,
-              notifyUser: relatedRequest.requestedBy,
-              subject: `${movie.title}${
-                movie.release_date ? ` (${movie.release_date.slice(0, 4)})` : ''
-              }`,
-              message: truncate(movie.overview, {
-                length: 500,
-                separator: /\s/,
-                omission: '…',
-              }),
-              media: entity,
-              image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${movie.poster_path}`,
-              request: relatedRequest,
-            });
-          } catch (e) {
-            logger.error('Something went wrong sending media notification(s)', {
-              label: 'Notifications',
-              errorMessage: e.message,
-              mediaId: entity.id,
-            });
-          }
-        }
-      }
-    }
-  }
-
-  private async notifyAvailableSeries(
-    entity: Media,
-    dbEntity: Media,
-    is4k: boolean
-  ) {
-    const seasonRepository = getRepository(Season);
-    const newAvailableSeasons = entity.seasons
-      .filter(
-        (season) =>
-          season[is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE
-      )
-      .map((season) => season.seasonNumber);
-    const oldSeasonIds = dbEntity.seasons.map((season) => season.id);
-    const oldSeasons = await seasonRepository.findBy({ id: In(oldSeasonIds) });
-    const oldAvailableSeasons = oldSeasons
-      .filter(
-        (season) =>
-          season[is4k ? 'status4k' : 'status'] === MediaStatus.AVAILABLE
-      )
-      .map((season) => season.seasonNumber);
-
-    const changedSeasons = newAvailableSeasons.filter(
-      (seasonNumber) => !oldAvailableSeasons.includes(seasonNumber)
-    );
-
-    if (changedSeasons.length > 0) {
-      const tmdb = new TheMovieDb();
-      const requestRepository = getRepository(MediaRequest);
-      const processedSeasons: number[] = [];
-
-      for (const changedSeasonNumber of changedSeasons) {
-        const requests = await requestRepository.find({
-          where: {
-            media: {
-              id: entity.id,
-            },
-            is4k,
-            status: MediaRequestStatus.COMPLETED,
-          },
-          order: { id: 'DESC' },
-        });
-        const request = requests.find(
-          (request) =>
-            // Check if the season is complete AND it contains the current season that was just marked available
-            request.seasons.every((season) =>
-              newAvailableSeasons.includes(season.seasonNumber)
-            ) &&
-            request.seasons.some(
-              (season) => season.seasonNumber === changedSeasonNumber
-            )
-        );
-
-        if (request && !processedSeasons.includes(changedSeasonNumber)) {
-          processedSeasons.push(
-            ...request.seasons.map((season) => season.seasonNumber)
-          );
-
-          try {
-            const tv = await tmdb.getTvShow({ tvId: entity.tmdbId });
-            notificationManager.sendNotification(Notification.MEDIA_AVAILABLE, {
-              event: `${is4k ? '4K ' : ''}Series Request Now Available`,
-              subject: `${tv.name}${
-                tv.first_air_date ? ` (${tv.first_air_date.slice(0, 4)})` : ''
-              }`,
-              message: truncate(tv.overview, {
-                length: 500,
-                separator: /\s/,
-                omission: '…',
-              }),
-              notifyAdmin: false,
-              notifySystem: true,
-              notifyUser: request.requestedBy,
-              image: `https://image.tmdb.org/t/p/w600_and_h900_bestv2${tv.poster_path}`,
-              media: entity,
-              extra: [
-                {
-                  name: 'Requested Seasons',
-                  value: request.seasons
-                    .map((season) => season.seasonNumber)
-                    .join(', '),
-                },
-              ],
-              request,
-            });
-          } catch (e) {
-            logger.error('Something went wrong sending media notification(s)', {
-              label: 'Notifications',
-              errorMessage: e.message,
-              mediaId: entity.id,
-            });
-          }
-        }
-      }
-    }
-  }
-
   private async updateChildRequestStatus(event: Media, is4k: boolean) {
     const requestRepository = getRepository(MediaRequest);
 
@@ -192,52 +30,6 @@ export class MediaSubscriber implements EntitySubscriberInterface<Media> {
       return;
     }
 
-    if (
-      event.entity.mediaType === MediaType.MOVIE &&
-      event.entity.status === MediaStatus.AVAILABLE
-    ) {
-      this.notifyAvailableMovie(
-        event.entity as Media,
-        event.databaseEntity,
-        false
-      );
-    }
-
-    if (
-      event.entity.mediaType === MediaType.MOVIE &&
-      event.entity.status4k === MediaStatus.AVAILABLE
-    ) {
-      this.notifyAvailableMovie(
-        event.entity as Media,
-        event.databaseEntity,
-        true
-      );
-    }
-
-    if (
-      event.entity.mediaType === MediaType.TV &&
-      (event.entity.status === MediaStatus.AVAILABLE ||
-        event.entity.status === MediaStatus.PARTIALLY_AVAILABLE)
-    ) {
-      this.notifyAvailableSeries(
-        event.entity as Media,
-        event.databaseEntity,
-        false
-      );
-    }
-
-    if (
-      event.entity.mediaType === MediaType.TV &&
-      (event.entity.status4k === MediaStatus.AVAILABLE ||
-        event.entity.status4k === MediaStatus.PARTIALLY_AVAILABLE)
-    ) {
-      this.notifyAvailableSeries(
-        event.entity as Media,
-        event.databaseEntity,
-        true
-      );
-    }
-
     if (
       event.entity.status === MediaStatus.AVAILABLE &&
       event.databaseEntity.status === MediaStatus.PENDING
diff --git a/src/i18n/locale/en.json b/src/i18n/locale/en.json
index 10165c9e..2464a76d 100644
--- a/src/i18n/locale/en.json
+++ b/src/i18n/locale/en.json
@@ -1190,9 +1190,11 @@
   "i18n.canceling": "Canceling…",
   "i18n.close": "Close",
   "i18n.collection": "Collection",
+  "i18n.completed": "Completed",
   "i18n.decline": "Decline",
   "i18n.declined": "Declined",
   "i18n.delete": "Delete",
+  "i18n.deleted": "Deleted",
   "i18n.deleting": "Deleting…",
   "i18n.delimitedlist": "{a}, {b}",
   "i18n.edit": "Edit",

From 8d96c0ce53ec1f396f1553de4ceecd1b30efc1fd Mon Sep 17 00:00:00 2001
From: Brandon Cohen <brandon@z3hn.dev>
Date: Mon, 26 Jun 2023 13:49:06 -0400
Subject: [PATCH 12/13] refactor: cleaned up code and added more detail to logs

---
 server/lib/availabilitySync.ts | 33 ++++++++++++++++++++++++++++++---
 server/routes/request.ts       |  2 +-
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/server/lib/availabilitySync.ts b/server/lib/availabilitySync.ts
index bab387fb..cfe02565 100644
--- a/server/lib/availabilitySync.ts
+++ b/server/lib/availabilitySync.ts
@@ -3,7 +3,7 @@ import PlexAPI from '@server/api/plexapi';
 import RadarrAPI, { type RadarrMovie } from '@server/api/servarr/radarr';
 import type { SonarrSeason, SonarrSeries } from '@server/api/servarr/sonarr';
 import SonarrAPI from '@server/api/servarr/sonarr';
-import { MediaStatus } from '@server/constants/media';
+import { MediaRequestStatus, MediaStatus } from '@server/constants/media';
 import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
 import MediaRequest from '@server/entity/MediaRequest';
@@ -203,8 +203,8 @@ class AvailabilitySync {
             await this.mediaUpdater(media, true);
           }
         }
-        if (!mediaExists || didDeleteSeasons) {
-          await mediaRepository.save(media);
+        if (!mediaExists) {
+          await mediaRepository.save({ media, ...media });
         }
       }
     } catch (ex) {
@@ -487,6 +487,14 @@ class AvailabilitySync {
       }
     }
 
+    if ((!radarr || !radarr.hasFile) && !existsInPlex) {
+      movieExists = false;
+    }
+
+    if ((!radarr4k || !radarr4k.hasFile) && !existsInPlex4k) {
+      movieExists4k = false;
+    }
+
     return existsInRadarr;
   }
 
@@ -540,6 +548,25 @@ class AvailabilitySync {
       }
     }
 
+    if (
+      (!sonarr || sonarr.statistics.episodeFileCount === 0) &&
+      !existsInPlex
+    ) {
+      showExists = false;
+    }
+
+    if (
+      (!sonarr4k || sonarr4k.statistics.episodeFileCount === 0) &&
+      !existsInPlex4k
+    ) {
+      showExists4k = false;
+    }
+
+    // Here we check each season for availability
+    for (const season of media.seasons) {
+      await this.seasonExists(media, season, showExists, showExists4k);
+    }
+
     // Here we check each season for availability
     // If the API returns an error other than a 404,
     // we will have to prevent the season check from happening
diff --git a/server/routes/request.ts b/server/routes/request.ts
index 18cb6458..dd53588d 100644
--- a/server/routes/request.ts
+++ b/server/routes/request.ts
@@ -40,7 +40,6 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
       switch (req.query.filter) {
         case 'approved':
         case 'processing':
-        case 'available':
           statusFilter = [MediaRequestStatus.APPROVED];
           break;
         case 'pending':
@@ -56,6 +55,7 @@ requestRoutes.get<Record<string, unknown>, RequestResultsResponse>(
           statusFilter = [MediaRequestStatus.FAILED];
           break;
         case 'completed':
+        case 'available':
         case 'deleted':
           statusFilter = [MediaRequestStatus.COMPLETED];
           break;

From 44901b3e4f5f5ce550e150b1118172dbff8bf783 Mon Sep 17 00:00:00 2001
From: Brandon Cohen <brandon@z3hn.dev>
Date: Tue, 5 Dec 2023 17:32:58 -0800
Subject: [PATCH 13/13] refactor: updated to reflect latest availability sync
 changes

---
 server/lib/availabilitySync.ts | 307 ++++++++++++---------------------
 1 file changed, 112 insertions(+), 195 deletions(-)

diff --git a/server/lib/availabilitySync.ts b/server/lib/availabilitySync.ts
index cfe02565..f016a852 100644
--- a/server/lib/availabilitySync.ts
+++ b/server/lib/availabilitySync.ts
@@ -8,7 +8,6 @@ import { getRepository } from '@server/datasource';
 import Media from '@server/entity/Media';
 import MediaRequest from '@server/entity/MediaRequest';
 import type Season from '@server/entity/Season';
-import SeasonRequest from '@server/entity/SeasonRequest';
 import { User } from '@server/entity/User';
 import type { RadarrSettings, SonarrSettings } from '@server/lib/settings';
 import { getSettings } from '@server/lib/settings';
@@ -203,9 +202,6 @@ class AvailabilitySync {
             await this.mediaUpdater(media, true);
           }
         }
-        if (!mediaExists) {
-          await mediaRepository.save({ media, ...media });
-        }
       }
     } catch (ex) {
       logger.error('Failed to complete availability sync.', {
@@ -246,87 +242,55 @@ class AvailabilitySync {
     } while (mediaPage.length > 0);
   }
 
-  private findMediaStatus(
-    requests: MediaRequest[],
-    is4k: boolean
-  ): MediaStatus {
-    const filteredRequests = requests.filter(
-      (request) => request.is4k === is4k
-    );
-
-    let mediaStatus: MediaStatus;
-
-    if (
-      filteredRequests.some(
-        (request) => request.status === MediaRequestStatus.APPROVED
-      )
-    ) {
-      mediaStatus = MediaStatus.PROCESSING;
-    } else if (
-      filteredRequests.some(
-        (request) => request.status === MediaRequestStatus.PENDING
-      )
-    ) {
-      mediaStatus = MediaStatus.PENDING;
-    } else {
-      mediaStatus = MediaStatus.UNKNOWN;
-    }
-
-    return mediaStatus;
-  }
-
   private async mediaUpdater(media: Media, is4k: boolean): Promise<void> {
     const mediaRepository = getRepository(Media);
-    const requestRepository = getRepository(MediaRequest);
 
     try {
-      // Find all related requests only if
-      // the related media has an available status
-      const requests = await requestRepository
-        .createQueryBuilder('request')
-        .leftJoinAndSelect('request.media', 'media')
-        .where('(media.id = :id)', {
-          id: media.id,
-        })
-        .andWhere(
-          `(request.is4k = :is4k AND media.${
-            is4k ? 'status4k' : 'status'
-          } IN (:...mediaStatus))`,
-          {
-            mediaStatus: [
-              MediaStatus.AVAILABLE,
-              MediaStatus.PARTIALLY_AVAILABLE,
-            ],
-            is4k: is4k,
-          }
-        )
-        .getMany();
-
-      // Check if a season is processing or pending to
-      // make sure we set the media to the correct status
-      let mediaStatus = MediaStatus.UNKNOWN;
+      // If media type is tv, check if a season is processing
+      //to see if we need to keep the external metadata
+      let isMediaProcessing = false;
 
       if (media.mediaType === 'tv') {
-        mediaStatus = this.findMediaStatus(requests, is4k);
+        const requestRepository = getRepository(MediaRequest);
+
+        const request = await requestRepository
+          .createQueryBuilder('request')
+          .leftJoinAndSelect('request.media', 'media')
+          .where('(media.id = :id)', {
+            id: media.id,
+          })
+          .andWhere(
+            '(request.is4k = :is4k AND request.status = :requestStatus)',
+            {
+              requestStatus: MediaRequestStatus.APPROVED,
+              is4k: is4k,
+            }
+          )
+          .getOne();
+
+        if (request) {
+          isMediaProcessing = true;
+        }
       }
 
-      media[is4k ? 'status4k' : 'status'] = mediaStatus;
-      media[is4k ? 'serviceId4k' : 'serviceId'] =
-        mediaStatus === MediaStatus.PROCESSING
-          ? media[is4k ? 'serviceId4k' : 'serviceId']
-          : null;
+      // Set the non-4K or 4K media to deleted
+      // and change related columns to null if media
+      // is not processing
+      media[is4k ? 'status4k' : 'status'] = MediaStatus.DELETED;
+      media[is4k ? 'serviceId4k' : 'serviceId'] = isMediaProcessing
+        ? media[is4k ? 'serviceId4k' : 'serviceId']
+        : null;
       media[is4k ? 'externalServiceId4k' : 'externalServiceId'] =
-        mediaStatus === MediaStatus.PROCESSING
+        isMediaProcessing
           ? media[is4k ? 'externalServiceId4k' : 'externalServiceId']
           : null;
       media[is4k ? 'externalServiceSlug4k' : 'externalServiceSlug'] =
-        mediaStatus === MediaStatus.PROCESSING
+        isMediaProcessing
           ? media[is4k ? 'externalServiceSlug4k' : 'externalServiceSlug']
           : null;
-      media[is4k ? 'ratingKey4k' : 'ratingKey'] =
-        mediaStatus === MediaStatus.PROCESSING
-          ? media[is4k ? 'ratingKey4k' : 'ratingKey']
-          : null;
+      media[is4k ? 'ratingKey4k' : 'ratingKey'] = isMediaProcessing
+        ? media[is4k ? 'ratingKey4k' : 'ratingKey']
+        : null;
 
       logger.info(
         `The ${is4k ? '4K' : 'non-4K'} ${
@@ -338,13 +302,6 @@ class AvailabilitySync {
       );
 
       await mediaRepository.save({ media, ...media });
-
-      // Only delete media request if type is movie.
-      // Type tv request deletion is handled
-      // in the season request entity
-      if (requests.length > 0 && media.mediaType === 'movie') {
-        await requestRepository.remove(requests);
-      }
     } catch (ex) {
       logger.debug(
         `Failure updating the ${is4k ? '4K' : 'non-4K'} ${
@@ -364,35 +321,21 @@ class AvailabilitySync {
     is4k: boolean
   ): Promise<void> {
     const mediaRepository = getRepository(Media);
-    const seasonRequestRepository = getRepository(SeasonRequest);
 
+    // Filter out only the values that are false
+    // (media that should be deleted)
     const seasonsPendingRemoval = new Map(
       // Disabled linter as only the value is needed from the filter
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       [...seasons].filter(([_, exists]) => !exists)
     );
+    // Retrieve the season keys to pass into our log
     const seasonKeys = [...seasonsPendingRemoval.keys()];
 
     try {
-      // Need to check and see if there are any related season
-      // requests. If they are, we will need to delete them.
-      const seasonRequests = await seasonRequestRepository
-        .createQueryBuilder('seasonRequest')
-        .leftJoinAndSelect('seasonRequest.request', 'request')
-        .leftJoinAndSelect('request.media', 'media')
-        .where('(media.id = :id)', { id: media.id })
-        .andWhere(
-          '(request.is4k = :is4k AND seasonRequest.seasonNumber IN (:...seasonNumbers))',
-          {
-            seasonNumbers: seasonKeys,
-            is4k: is4k,
-          }
-        )
-        .getMany();
-
       for (const mediaSeason of media.seasons) {
         if (seasonsPendingRemoval.has(mediaSeason.seasonNumber)) {
-          mediaSeason[is4k ? 'status4k' : 'status'] = MediaStatus.UNKNOWN;
+          mediaSeason[is4k ? 'status4k' : 'status'] = MediaStatus.DELETED;
         }
       }
 
@@ -414,16 +357,12 @@ class AvailabilitySync {
 
       await mediaRepository.save({ media, ...media });
 
-      if (seasonRequests.length > 0) {
-        await seasonRequestRepository.remove(seasonRequests);
-      }
-
       logger.info(
         `The ${is4k ? '4K' : 'non-4K'} season(s) [${seasonKeys}] [TMDB ID ${
           media.tmdbId
         }] was not found in any ${
           media.mediaType === 'tv' ? 'Sonarr' : 'Radarr'
-        } and Plex instance. Status will be changed to unknown.`,
+        } and Plex instance. Status will be changed to deleted.`,
         { label: 'AvailabilitySync' }
       );
     } catch (ex) {
@@ -448,53 +387,47 @@ class AvailabilitySync {
     // Check for availability in all of the available radarr servers
     // If any find the media, we will assume the media exists
     for (const server of this.radarrServers) {
-      const radarrAPI = new RadarrAPI({
-        apiKey: server.apiKey,
-        url: RadarrAPI.buildUrl(server, '/api/v3'),
-      });
-
-      try {
-        let radarr: RadarrMovie | undefined;
-
-        if (!server.is4k && media.externalServiceId && !is4k) {
-          radarr = await radarrAPI.getMovie({
-            id: media.externalServiceId,
-          });
-        }
+      if (server.is4k === is4k) {
+        const radarrAPI = new RadarrAPI({
+          apiKey: server.apiKey,
+          url: RadarrAPI.buildUrl(server, '/api/v3'),
+        });
+
+        try {
+          let radarr: RadarrMovie | undefined;
+
+          if (media.externalServiceId && !is4k) {
+            radarr = await radarrAPI.getMovie({
+              id: media.externalServiceId,
+            });
+          }
 
-        if (server.is4k && media.externalServiceId4k && is4k) {
-          radarr = await radarrAPI.getMovie({
-            id: media.externalServiceId4k,
-          });
-        }
+          if (media.externalServiceId4k && is4k) {
+            radarr = await radarrAPI.getMovie({
+              id: media.externalServiceId4k,
+            });
+          }
 
-        if (radarr && radarr.hasFile) {
-          existsInRadarr = true;
-        }
-      } catch (ex) {
-        if (!ex.message.includes('404')) {
-          existsInRadarr = true;
-          logger.debug(
-            `Failure retrieving the ${is4k ? '4K' : 'non-4K'} movie [TMDB ID ${
-              media.tmdbId
-            }] from Radarr.`,
-            {
-              errorMessage: ex.message,
-              label: 'AvailabilitySync',
-            }
-          );
+          if (radarr && radarr.hasFile) {
+            existsInRadarr = true;
+          }
+        } catch (ex) {
+          if (!ex.message.includes('404')) {
+            existsInRadarr = true;
+            logger.debug(
+              `Failure retrieving the ${
+                is4k ? '4K' : 'non-4K'
+              } movie [TMDB ID ${media.tmdbId}] from Radarr.`,
+              {
+                errorMessage: ex.message,
+                label: 'AvailabilitySync',
+              }
+            );
+          }
         }
       }
     }
 
-    if ((!radarr || !radarr.hasFile) && !existsInPlex) {
-      movieExists = false;
-    }
-
-    if ((!radarr4k || !radarr4k.hasFile) && !existsInPlex4k) {
-      movieExists4k = false;
-    }
-
     return existsInRadarr;
   }
 
@@ -508,65 +441,49 @@ class AvailabilitySync {
     // Check for availability in all of the available sonarr servers
     // If any find the media, we will assume the media exists
     for (const server of this.sonarrServers) {
-      const sonarrAPI = new SonarrAPI({
-        apiKey: server.apiKey,
-        url: SonarrAPI.buildUrl(server, '/api/v3'),
-      });
-
-      try {
-        let sonarr: SonarrSeries | undefined;
-
-        if (!server.is4k && media.externalServiceId && !is4k) {
-          sonarr = await sonarrAPI.getSeriesById(media.externalServiceId);
-          this.sonarrSeasonsCache[`${server.id}-${media.externalServiceId}`] =
-            sonarr.seasons;
-        }
+      if (server.is4k === is4k) {
+        const sonarrAPI = new SonarrAPI({
+          apiKey: server.apiKey,
+          url: SonarrAPI.buildUrl(server, '/api/v3'),
+        });
+
+        try {
+          let sonarr: SonarrSeries | undefined;
+
+          if (media.externalServiceId && !is4k) {
+            sonarr = await sonarrAPI.getSeriesById(media.externalServiceId);
+            this.sonarrSeasonsCache[`${server.id}-${media.externalServiceId}`] =
+              sonarr.seasons;
+          }
 
-        if (server.is4k && media.externalServiceId4k && is4k) {
-          sonarr = await sonarrAPI.getSeriesById(media.externalServiceId4k);
-          this.sonarrSeasonsCache[`${server.id}-${media.externalServiceId4k}`] =
-            sonarr.seasons;
-        }
+          if (media.externalServiceId4k && is4k) {
+            sonarr = await sonarrAPI.getSeriesById(media.externalServiceId4k);
+            this.sonarrSeasonsCache[
+              `${server.id}-${media.externalServiceId4k}`
+            ] = sonarr.seasons;
+          }
 
-        if (sonarr && sonarr.statistics.episodeFileCount > 0) {
-          existsInSonarr = true;
-        }
-      } catch (ex) {
-        if (!ex.message.includes('404')) {
-          existsInSonarr = true;
-          preventSeasonSearch = true;
-          logger.debug(
-            `Failure retrieving the ${is4k ? '4K' : 'non-4K'} show [TMDB ID ${
-              media.tmdbId
-            }] from Sonarr.`,
-            {
-              errorMessage: ex.message,
-              label: 'AvailabilitySync',
-            }
-          );
+          if (sonarr && sonarr.statistics.episodeFileCount > 0) {
+            existsInSonarr = true;
+          }
+        } catch (ex) {
+          if (!ex.message.includes('404')) {
+            existsInSonarr = true;
+            preventSeasonSearch = true;
+            logger.debug(
+              `Failure retrieving the ${is4k ? '4K' : 'non-4K'} show [TMDB ID ${
+                media.tmdbId
+              }] from Sonarr.`,
+              {
+                errorMessage: ex.message,
+                label: 'AvailabilitySync',
+              }
+            );
+          }
         }
       }
     }
 
-    if (
-      (!sonarr || sonarr.statistics.episodeFileCount === 0) &&
-      !existsInPlex
-    ) {
-      showExists = false;
-    }
-
-    if (
-      (!sonarr4k || sonarr4k.statistics.episodeFileCount === 0) &&
-      !existsInPlex4k
-    ) {
-      showExists4k = false;
-    }
-
-    // Here we check each season for availability
-    for (const season of media.seasons) {
-      await this.seasonExists(media, season, showExists, showExists4k);
-    }
-
     // Here we check each season for availability
     // If the API returns an error other than a 404,
     // we will have to prevent the season check from happening