Merge pull request #119 from HSLdevcom/apc-bike-class

apc bike class added

Author: ahjyrkia

src/auth/groupAssignments.ts

@@ -31,7 +31,10 @@ export async function assignUserToGroups(userInfo: IUserInfo): Promise<IUserInfo
   )
 
   const sessionGroups = userInfo.groups
-  const emailDomainGroups = assignGroups.filter((dg) => userInfo.email.endsWith(dg.domain))
+  const emailDomain = userInfo.email.split('@')[1]?.toLowerCase()
+  const emailDomainGroups = assignGroups.filter(
+    (dg) => emailDomain === dg.domain.toLowerCase()
+  )
   const groupAssignments = uniq(flatten(emailDomainGroups.map(({ groups }) => groups)))
   const assignToGroups = difference(groupAssignments, sessionGroups)
 

src/datasources/HFPDataSource.ts

@@ -309,7 +309,7 @@ ORDER BY tst DESC;
   ): Promise<Vehicles[]> {
     const { minLat, maxLat, minLng, maxLng } = bbox
     const speedInMetersPerSecond = speedFilter / 3.6
-
+    maxTime = maxTime.clone().add(4, 'hours')
     const createQuery = (table) => {
       return this.db.raw(
         `

src/objects/createJourneyEventObject.ts

@@ -356,6 +356,8 @@ export function createPassengerCountEventObject(
   const vehicleLoad = authorized ? event.vehicle_load : null
   const totalPassengersIn = authorized ? event.total_passengers_in : null
   const totalPassengersOut = authorized ? event.total_passengers_out : null
+  const bikesIn = authorized ? event.bikes_in : null
+  const bikesOut = authorized ? event.bikes_out : null
   let vehicleLoadRatioText = 'empty'
 
   if (event.vehicle_load_ratio && event.vehicle_load_ratio >= 0.05) {
@@ -397,6 +399,8 @@ export function createPassengerCountEventObject(
     totalPassengersIn,
     totalPassengersOut,
     vehicleLoadRatioText,
+    bikesIn,
+    bikesOut,
     _sort: unix,
   }
 }

src/schema/Journey.ts

@@ -89,6 +89,8 @@ export const Journey = gql`
     totalPassengersIn: Int
     totalPassengersOut: Int
     vehicleLoadRatioText: String
+    bikesIn: Int
+    bikesOut: Int
     _sort: Int
   }
 

src/types/EventsDb.ts

@@ -169,6 +169,8 @@ export type PassengerCount = {
   vehicle_load_ratio: Maybe<number>
   total_passengers_in: Maybe<number>
   total_passengers_out: Maybe<number>
+  bikes_in: Maybe<number>
+  bikes_out: Maybe<number>
 }
 
 export type EventsType =

src/types/generated/resolver-types.ts

@@ -454,6 +454,8 @@ export type JourneyPassengerCountEvent = {
   totalPassengersIn?: Maybe<Scalars['Int']>
   totalPassengersOut?: Maybe<Scalars['Int']>
   vehicleLoadRatioText?: Maybe<Scalars['String']>
+  bikesIn?: Maybe<Scalars['Int']>
+  bikesOut?: Maybe<Scalars['Int']>
   _sort?: Maybe<Scalars['Int']>
 }
 
@@ -1108,8 +1110,8 @@ export type ResolversTypes = {
   Mutation: ResolverTypeWrapper<{}>
   Feedback: ResolverTypeWrapper<Feedback>
   Upload: ResolverTypeWrapper<Scalars['Upload']>
-  TlpType: TlpType
   BBox: ResolverTypeWrapper<Scalars['BBox']>
+  TlpType: TlpType
 }
 
 /** Mapping between all available schema types and the resolvers parents */
@@ -1184,8 +1186,8 @@ export type ResolversParentTypes = {
   Mutation: {}
   Feedback: Feedback
   Upload: Scalars['Upload']
-  TlpType: TlpType
   BBox: Scalars['BBox']
+  TlpType: TlpType
 }
 
 export type AlertResolvers<
@@ -1507,6 +1509,8 @@ export type JourneyPassengerCountEventResolvers<
   totalPassengersIn?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>
   totalPassengersOut?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>
   vehicleLoadRatioText?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>
+  bikesIn?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>
+  bikesOut?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>
   _sort?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>
 }
 

src/types/generated/schema-types.ts

@@ -450,6 +450,8 @@ export type JourneyPassengerCountEvent = {
   totalPassengersIn?: Maybe<Scalars['Int']>
   totalPassengersOut?: Maybe<Scalars['Int']>
   vehicleLoadRatioText?: Maybe<Scalars['String']>
+  bikesIn?: Maybe<Scalars['Int']>
+  bikesOut?: Maybe<Scalars['Int']>
   _sort?: Maybe<Scalars['Int']>
 }