Merge pull request #120 from HSLdevcom/apc-classes

support for rest of the apc classes

Author: ahjyrkia

src/objects/createJourneyEventObject.ts

@@ -358,6 +358,13 @@ export function createPassengerCountEventObject(
   const totalPassengersOut = authorized ? event.total_passengers_out : null
   const bikesIn = authorized ? event.bikes_in : null
   const bikesOut = authorized ? event.bikes_out : null
+
+  const wheelchairsIn = authorized ? event.wheelchairs_in : null
+  const wheelchairsOut = authorized ? event.wheelchairs_out : null
+  const pramsIn = authorized ? event.prams_in : null
+  const pramsOut = authorized ? event.prams_out : null
+  const otherIn = authorized ? event.other_in : null
+  const otherOut = authorized ? event.other_out : null
   let vehicleLoadRatioText = 'empty'
 
   if (event.vehicle_load_ratio && event.vehicle_load_ratio >= 0.05) {
@@ -401,6 +408,12 @@ export function createPassengerCountEventObject(
     vehicleLoadRatioText,
     bikesIn,
     bikesOut,
+    wheelchairsIn,
+    wheelchairsOut,
+    pramsIn,
+    pramsOut,
+    otherIn,
+    otherOut,
     _sort: unix,
   }
 }

src/schema/Journey.ts

@@ -91,6 +91,12 @@ export const Journey = gql`
     vehicleLoadRatioText: String
     bikesIn: Int
     bikesOut: Int
+    wheelchairsIn: Int
+    wheelchairsOut: Int
+    pramsIn: Int
+    pramsOut: Int
+    otherIn: Int
+    otherOut: Int
     _sort: Int
   }
 

src/types/EventsDb.ts

@@ -171,6 +171,12 @@ export type PassengerCount = {
   total_passengers_out: Maybe<number>
   bikes_in: Maybe<number>
   bikes_out: Maybe<number>
+  wheelchairs_in: Maybe<number>
+  wheelchairs_out: Maybe<number>
+  prams_in: Maybe<number>
+  prams_out: Maybe<number>
+  other_in: Maybe<number>
+  other_out: Maybe<number>
 }
 
 export type EventsType =

src/types/generated/resolver-types.ts

@@ -456,6 +456,12 @@ export type JourneyPassengerCountEvent = {
   vehicleLoadRatioText?: Maybe<Scalars['String']>
   bikesIn?: Maybe<Scalars['Int']>
   bikesOut?: Maybe<Scalars['Int']>
+  wheelchairsIn?: Maybe<Scalars['Int']>
+  wheelchairsOut?: Maybe<Scalars['Int']>
+  pramsIn?: Maybe<Scalars['Int']>
+  pramsOut?: Maybe<Scalars['Int']>
+  otherIn?: Maybe<Scalars['Int']>
+  otherOut?: Maybe<Scalars['Int']>
   _sort?: Maybe<Scalars['Int']>
 }
 
@@ -1511,6 +1517,12 @@ export type JourneyPassengerCountEventResolvers<
   vehicleLoadRatioText?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>
   bikesIn?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>
   bikesOut?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>
+  wheelchairsIn?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>
+  wheelchairsOut?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>
+  pramsIn?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>
+  pramsOut?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>
+  otherIn?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>
+  otherOut?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>
   _sort?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>
 }
 

src/types/generated/schema-types.ts

@@ -452,6 +452,12 @@ export type JourneyPassengerCountEvent = {
   vehicleLoadRatioText?: Maybe<Scalars['String']>
   bikesIn?: Maybe<Scalars['Int']>
   bikesOut?: Maybe<Scalars['Int']>
+  wheelchairsIn?: Maybe<Scalars['Int']>
+  wheelchairsOut?: Maybe<Scalars['Int']>
+  pramsIn?: Maybe<Scalars['Int']>
+  pramsOut?: Maybe<Scalars['Int']>
+  otherIn?: Maybe<Scalars['Int']>
+  otherOut?: Maybe<Scalars['Int']>
   _sort?: Maybe<Scalars['Int']>
 }