@memberjunction/server 2.49.0 → 2.51.0

package/src/resolvers/UserFavoriteResolver.ts

@@ -69,17 +69,17 @@ export class UserFavoriteResult {
 @Resolver(UserFavorite_)
 export class UserFavoriteResolver extends UserFavoriteResolverBase {
   @Query(() => [UserFavorite_])
-  async UserFavoritesByUserID(@Arg('UserID', () => Int) UserID: number, @Ctx() { dataSource }: AppContext) {
-    return await this.findBy(dataSource, 'User Favorites', { UserID });
+  async UserFavoritesByUserID(@Arg('UserID', () => Int) UserID: number, @Ctx() { dataSource, userPayload }: AppContext) {
+    return await this.findBy(dataSource, 'User Favorites', { UserID }, userPayload.userRecord);
   }
 
   @Query(() => [UserFavorite_])
-  async UserFavoriteSearchByParams(@Arg('params', () => Int) params: UserFavoriteSearchParams, @Ctx() { dataSource }: AppContext) {
-    return await this.findBy(dataSource, 'User Favorites', params);
+  async UserFavoriteSearchByParams(@Arg('params', () => Int) params: UserFavoriteSearchParams, @Ctx() { dataSource, userPayload }: AppContext) {
+    return await this.findBy(dataSource, 'User Favorites', params, userPayload.userRecord);
   }
 
   @Query(() => UserFavoriteResult)
-  async GetRecordFavoriteStatus(@Arg('params', () => UserFavoriteSearchParams) params: UserFavoriteSearchParams, @Ctx() {}: AppContext) {
+  async GetRecordFavoriteStatus(@Arg('params', () => UserFavoriteSearchParams) params: UserFavoriteSearchParams, @Ctx() {userPayload}: AppContext) {
     const md = new Metadata();
     const pk = new CompositeKey(params.CompositeKey.KeyValuePairs);
 
@@ -89,7 +89,7 @@ export class UserFavoriteResolver extends UserFavoriteResolverBase {
         EntityID: params.EntityID,
         UserID: params.UserID,
         CompositeKey: pk,
-        IsFavorite: await md.GetRecordFavoriteStatus(params.UserID, e.Name, pk),
+        IsFavorite: await md.GetRecordFavoriteStatus(params.UserID, e.Name, pk, userPayload.userRecord),
         Success: true,
       };
     else throw new Error(`Entity ID:${params.EntityID} not found`);

package/src/resolvers/UserResolver.ts

@@ -11,22 +11,22 @@ export class UserResolver extends UserResolverBase {
   }
 
   @Query(() => User_)
-  async UserByID(@Arg('ID', () => Int) ID: number, @Ctx() { dataSource }: AppContext) {
-    const retVal = super.safeFirstArrayElement(await this.findBy(dataSource, 'Users', { ID }));
+  async UserByID(@Arg('ID', () => Int) ID: number, @Ctx() { dataSource, userPayload }: AppContext) {
+    const retVal = super.safeFirstArrayElement(await this.findBy(dataSource, 'Users', { ID }, userPayload.userRecord));
     return this.MapFieldNamesToCodeNames('Users', retVal);
   }
 
   @Query(() => User_)
-  async UserByEmployeeID(@Arg('EmployeeID', () => Int) EmployeeID: number, @Ctx() { dataSource }: AppContext) {
-    const retVal = super.safeFirstArrayElement(await this.findBy(dataSource, 'Users', { EmployeeID }));
+  async UserByEmployeeID(@Arg('EmployeeID', () => Int) EmployeeID: number, @Ctx() { dataSource, userPayload }: AppContext) {
+    const retVal = super.safeFirstArrayElement(await this.findBy(dataSource, 'Users', { EmployeeID }, userPayload.userRecord));
     return this.MapFieldNamesToCodeNames('Users', retVal);
   }
 
   @Query(() => User_)
-  async UserByEmail(@Arg('Email', () => String) Email: string, @Ctx() { dataSource }: AppContext) {
+  async UserByEmail(@Arg('Email', () => String) Email: string, @Ctx() { dataSource, userPayload }: AppContext) {
     // const searchEmail = userEmailMap[Email] ?? Email;
     const searchEmail = Email;
-    const returnVal = super.safeFirstArrayElement(await this.findBy(dataSource, 'Users', { Email: searchEmail }));
+    const returnVal = super.safeFirstArrayElement(await this.findBy(dataSource, 'Users', { Email: searchEmail }, userPayload.userRecord));
     return this.MapFieldNamesToCodeNames('Users', returnVal);
   }
 }

package/src/resolvers/UserViewResolver.ts

@@ -8,17 +8,17 @@ import { UserViewEntity, UserViewEntityExtended } from '@memberjunction/core-ent
 @Resolver(UserView_)
 export class UserViewResolver extends UserViewResolverBase {
   @Query(() => [UserView_])
-  async UserViewsByUserID(@Arg('UserID', () => Int) UserID: number, @Ctx() { dataSource }: AppContext) {
-    return await this.findBy(dataSource, 'User Views', { UserID });
+  async UserViewsByUserID(@Arg('UserID', () => Int) UserID: number, @Ctx() { dataSource, userPayload }: AppContext) {
+    return await this.findBy(dataSource, 'User Views', { UserID }, userPayload.userRecord);
   }
 
   @Query(() => [UserView_])
   async DefaultViewByUserAndEntity(
     @Arg('UserID', () => Int) UserID: number,
     @Arg('EntityID', () => Int) EntityID: number,
-    @Ctx() { dataSource }: AppContext
+    @Ctx() { dataSource, userPayload }: AppContext
   ) {
-    return await this.findBy(dataSource, 'User Views', { UserID, EntityID, IsDefault: true });
+    return await this.findBy(dataSource, 'User Views', { UserID, EntityID, IsDefault: true }, userPayload.userRecord);
   }
 
   @Query(() => [UserView_])
@@ -27,7 +27,7 @@ export class UserViewResolver extends UserViewResolverBase {
       UserID: await this.getCurrentUserID(context),
       EntityID,
       IsDefault: true,
-    });
+    }, context.userPayload.userRecord);
   }
 
   protected async getCurrentUserID(context: AppContext): Promise<number> {
@@ -38,7 +38,7 @@ export class UserViewResolver extends UserViewResolverBase {
 
   @Query(() => [UserView_])
   async CurrentUserUserViewsByEntityID(@Arg('EntityID', () => Int) EntityID: number, @Ctx() context: AppContext) {
-    return this.findBy(context.dataSource, 'User Views', { UserID: await this.getCurrentUserID(context), EntityID });
+    return this.findBy(context.dataSource, 'User Views', { UserID: await this.getCurrentUserID(context), EntityID}, context.userPayload.userRecord);
   }
 
   @Query(() => [UserView_])