feat: update ItemService and StatsAggregatedItemService to utilize live item status enum for filtering

Author: mitchdowney

src/services/item/item.ts

@@ -24,6 +24,7 @@ import { ItemValueTimeSplitRemoteItemService } from './itemValueTimeSplitRemoteI
 import { ItemValueTimeSplit } from '@orm/entities/item/itemValueTimeSplit';
 import { ItemFlagStatusService } from './itemFlagStatus';
 import { ItemFlagStatusStatusEnum } from '@orm/entities/item/itemFlagStatus';
+import { getLiveItemStatusEnumValue } from '@orm/entities/liveItem/liveItemStatus';
 
 type ItemDto = {
   title: string | null
@@ -220,8 +221,10 @@ export class ItemService {
     medium_id: MediumEnum | null,
     category_id: number | null,
     itemType: 'normal' | 'live-item',
-    liveItemType: LiveItemStatusEnum | null
+    liveItemType: 'pending' | 'live' | 'ended' | null
   ): Promise<Item[]> {
+    const live_item_status_id = getLiveItemStatusEnumValue(liveItemType);
+    
     return this.repositoryRead.find({
       ...config,
       where: {
@@ -237,7 +240,7 @@ export class ItemService {
         },
         live_item: {
           id: itemType === 'live-item' ? Not(IsNull()) : IsNull(),
-          ...(liveItemType ? { live_item_status_id: Equal(liveItemType) } : {})
+          ...(live_item_status_id ? { live_item_status_id: Equal(live_item_status_id) } : {})
         }
       }
     });
@@ -392,12 +395,20 @@ export class ItemService {
     });
   }
 
-  async getManyByChannels(channels: Channel[], options?: FindManyOptions<Item>): Promise<Item[]> {
+  async getManyByChannels(
+    channels: Channel[],
+    itemType: 'normal' | 'live-item',
+    liveItemType: 'pending' | 'live' | 'ended' | null,
+    options?: FindManyOptions<Item>
+  ): Promise<Item[]> {
+    const live_item_status_id = getLiveItemStatusEnumValue(liveItemType);
+
     return this.repositoryRead.find({
       where: {
         channel: In(channels),
         live_item: {
-          id: IsNull()
+          id: itemType === 'live-item' ? Not(IsNull()) : IsNull(),
+          ...(live_item_status_id ? { live_item_status_id: Equal(live_item_status_id) } : {})
         },
         item_flag_status: {
           id: ItemFlagStatusStatusEnum.Active

src/services/stats/statsAggregatedItem.ts

@@ -2,8 +2,9 @@ import { MediumEnum } from 'podverse-helpers';
 import { StatsAggregatedItem } from '@orm/entities/stats/statsAggregatedItem';
 import { StatsTrackEventItemService } from './statsTrackEventItem';
 import { BaseStatsAggregatedService, UpdateHistoricalOptions } from './baseStatsAggregated';
-import { FindManyOptions, IsNull, Not } from 'typeorm';
+import { Equal, FindManyOptions, IsNull, Not } from 'typeorm';
 import { getActiveFeedWhere } from '@orm/lib/feedFlagHelpers';
+import { getLiveItemStatusEnumValue } from '@orm/index';
 
 export class StatsAggregatedItemService extends BaseStatsAggregatedService<StatsAggregatedItem, number> {
   private statsTrackEventItemService: StatsTrackEventItemService;
@@ -21,8 +22,11 @@ export class StatsAggregatedItemService extends BaseStatsAggregatedService<Stats
     config: FindManyOptions<StatsAggregatedItem>,
     medium_id: MediumEnum | null,
     category_id: number | null,
-    itemType: 'normal' | 'live-item'
+    itemType: 'normal' | 'live-item',
+    liveItemType: 'pending' | 'live' | 'ended' | null
   ): Promise<StatsAggregatedItem[]> {
+    const live_item_status_id = getLiveItemStatusEnumValue(liveItemType);
+
     return this.repositoryRead.find({
       where: {
         item: {
@@ -32,7 +36,9 @@ export class StatsAggregatedItemService extends BaseStatsAggregatedService<Stats
             category_id
           }),
           live_item: {
-            id: itemType === 'live-item' ? Not(IsNull()) : IsNull()
+            id: itemType === 'live-item' ? Not(IsNull()) : IsNull(),
+            ...(live_item_status_id ? { live_item_status_id: Equal(live_item_status_id) } : {})
+
           }
         }
       },
@@ -43,8 +49,11 @@ export class StatsAggregatedItemService extends BaseStatsAggregatedService<Stats
   async getManyByChannelsAndCount(
     config: FindManyOptions<StatsAggregatedItem>,
     channel_ids: number[],
-    itemType: 'normal' | 'live-item'
+    itemType: 'normal' | 'live-item',
+    liveItemType: 'pending' | 'live' | 'ended' | null
   ): Promise<[StatsAggregatedItem[], number]> {
+    const live_item_status_id = getLiveItemStatusEnumValue(liveItemType);
+
     return this.repositoryRead.findAndCount({
       where: {
         item: {
@@ -54,7 +63,8 @@ export class StatsAggregatedItemService extends BaseStatsAggregatedService<Stats
             category_id: null
           }),
           live_item: {
-            id: itemType === 'live-item' ? Not(IsNull()) : IsNull()
+            id: itemType === 'live-item' ? Not(IsNull()) : IsNull(),
+            ...(live_item_status_id ? { live_item_status_id: Equal(live_item_status_id) } : {})
           }
         }
       },