Filter events by user info

database/migrations/20240129232022_addAppsToUsers.js

@@ -0,0 +1,19 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function (knex) {
+  return knex.schema.alterTable('users', (table) => {
+    table.jsonb('apps');
+  });
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function (knex) {
+  return knex.schema.alterTable('users', (table) => {
+    table.dropColumn('apps');
+  });
+};

database/migrations/20240201152282_removeAppsFromUsers.js

@@ -0,0 +1,19 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function (knex) {
+  return knex.schema.alterTable('users', (table) => {
+    table.dropColumn('apps');
+  });
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function (knex) {
+  return knex.schema.alterTable('users', (table) => {
+    table.jsonb('apps');
+  });
+};

services/api.service.ts

@@ -1,17 +1,10 @@
+import { User } from '@sentry/types';
 import pick from 'lodash/pick';
 import moleculer, { Context, Errors } from 'moleculer';
 import { Action, Method, Service } from 'moleculer-decorators';
 import ApiGateway from 'moleculer-web';
-import {
-  AppAuthMeta,
-  EndpointType,
-  RequestMessage,
-  UserAuthMeta,
-  throwUnauthorizedError,
-} from '../types';
-import { App } from './apps.service';
+import { EndpointType, RequestMessage, throwUnauthorizedError, UserAuthMeta } from '../types';
 import { UserType } from './users.service';
-import { User } from '@sentry/types';
 
 @Service({
   name: 'api',

services/events.service.ts

@@ -5,13 +5,13 @@ import { Service } from 'moleculer-decorators';
 import PostgisMixin from 'moleculer-postgis';
 import DbConnection from '../mixins/database.mixin';
 import {
-  COMMON_FIELDS,
+  CommonFields,
+  CommonPopulates,
   COMMON_DEFAULT_SCOPES,
+  COMMON_FIELDS,
   COMMON_SCOPES,
   EndpointType,
-  CommonPopulates,
   Table,
-  CommonFields,
 } from '../types';
 import { App } from './apps.service';
 

services/newsfeed.service.ts

@@ -0,0 +1,89 @@
+'use strict';
+import { isEmpty } from 'lodash';
+import moleculer, { Context } from 'moleculer';
+import { Action, Method, Service } from 'moleculer-decorators';
+import { intersectsQuery } from 'moleculer-postgis';
+import { UserAuthMeta } from '../types';
+import { parseToJsonIfNeeded } from '../utils';
+import { Subscription } from './subscriptions.service';
+
+@Service({
+  name: 'newsfeed',
+
+  hooks: {
+    before: {
+      list: ['applyFilters'],
+      find: ['applyFilters'],
+      get: ['applyFilters'],
+      resolve: ['applyFilters'],
+    },
+  },
+})
+export default class NewsfeedService extends moleculer.Service {
+  @Action({
+    rest: 'GET /',
+  })
+  async list(ctx: Context<any, UserAuthMeta>) {
+    return ctx.call('events.list', {
+      ...ctx.params,
+    });
+  }
+
+  @Action()
+  async find(ctx: Context<any, UserAuthMeta>) {
+    return ctx.call('events.find', {
+      ...ctx.params,
+    });
+  }
+
+  @Action()
+  async get(ctx: Context<any, UserAuthMeta>) {
+    const { id } = ctx.params;
+    return ctx.call('events.get', {
+      ...ctx.params,
+      id,
+    });
+  }
+
+  @Action()
+  async resolve(ctx: Context<any, UserAuthMeta>) {
+    const { id } = ctx.params;
+    return ctx.call('events.resolve', {
+      ...ctx.params,
+      id,
+    });
+  }
+
+  @Method
+  async applyFilters(ctx: Context<any, UserAuthMeta>) {
+    ctx.params.query = parseToJsonIfNeeded(ctx.params.query) || {};
+    const { user } = ctx.meta;
+
+    const subscriptions: Subscription[] = await ctx.call('subscriptions.find', {
+      query: {
+        user: user.id,
+        active: true,
+      },
+      populate: ['geom'],
+    });
+
+    if (isEmpty(subscriptions)) {
+      ctx.params.query.$or = { app: { $in: [] } };
+      return ctx;
+    }
+
+    const subscriptionQuery = subscriptions.map((subscription) => ({
+      ...(!isEmpty(subscription.apps) && { app: { $in: subscription.apps } }),
+      $raw: intersectsQuery('geom', subscription.geom, 3346),
+    }));
+
+    if (ctx?.params?.query?.$or) {
+      ctx.params.query.$and = [ctx?.params?.query?.$or, { $or: subscriptionQuery }];
+      delete ctx?.params?.query?.$or;
+    } else {
+      ctx.params.query.$or = subscriptionQuery;
+    }
+
+    return ctx;
+  }
+}

services/subscriptions.service.ts

@@ -29,6 +29,7 @@ const sender = 'noreply@biip.lt';
 interface Fields extends CommonFields {
   user: User['id'];
   apps: number[];
+  geom: any;
   frequency: Frequency;
   active: boolean;
   lastSent: Date;

services/users.service.ts

@@ -5,16 +5,15 @@ import { Action, Event, Service } from 'moleculer-decorators';
 
 import DbConnection from '../mixins/database.mixin';
 import {
-  COMMON_FIELDS,
+  BaseModelInterface,
   COMMON_DEFAULT_SCOPES,
+  COMMON_FIELDS,
   COMMON_SCOPES,
-  FieldHookCallback,
-  BaseModelInterface,
   EndpointType,
+  FieldHookCallback,
   throwNotFoundError,
   UserAuthMeta,
 } from '../types';
-import PostgisMixin from 'moleculer-postgis';
 
 export enum UserType {
   ADMIN = 'ADMIN',