resolve conflict

Author: quangtuanitmo18

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hawk.api",
-  "version": "1.4.8",
+  "version": "1.4.12",
   "main": "index.ts",
   "license": "BUSL-1.1",
   "scripts": {
@@ -41,7 +41,7 @@
     "@graphql-tools/merge": "^8.3.1",
     "@graphql-tools/schema": "^8.5.1",
     "@graphql-tools/utils": "^8.9.0",
-    "@hawk.so/nodejs": "^3.3.1",
+    "@hawk.so/nodejs": "^3.3.2",
     "@hawk.so/types": "^0.5.9",
     "@n1ru4l/json-patch-plus": "^0.2.0",
     "@node-saml/node-saml": "^5.0.1",

src/models/eventsFactory.js

@@ -203,10 +203,11 @@ class EventsFactory extends Factory {
    *
    * @param {Number} limit - events count limitations
    * @param {DailyEventsCursor} paginationCursor - object that contains boundary values of the last event in the previous portion
-   * @param {'BY_DATE' | 'BY_COUNT'} sort - events sort order
-   * @param {EventsFilters} filters - marks by which events should be filtered
+   * @param {'BY_DATE' | 'BY_COUNT' | 'BY_AFFECTED_USERS'} sort - events sort order
+   * @param {EventsFilters} filters - marks by which events should be filtered (resolved, starred, ignored only; assignee is separate)
    * @param {String} search - Search query
-   * @param {String} release - release name
+   * @param {String|undefined} release - release name
+   * @param {String|undefined} assignee - user id or __filter_unassigned__ / __filter_any_assignee__
    *
    * @return {DaylyEventsPortionSchema}
    */
@@ -216,7 +217,8 @@ class EventsFactory extends Factory {
     sort = 'BY_DATE',
     filters = {},
     search = '',
-    release
+    release,
+    assignee
   ) {
     if (typeof search !== 'string') {
       throw new Error('Search parameter must be a string');
@@ -334,10 +336,12 @@ class EventsFactory extends Factory {
       }
       : {};
 
+    const markFilters = ['resolved', 'starred', 'ignored'];
     const matchFilter = filters
       ? Object.fromEntries(
         Object
           .entries(filters)
+          .filter(([ mark ]) => markFilters.includes(mark))
           .map(([mark, exists]) => [`event.marks.${mark}`, { $exists: exists } ])
       )
       : {};
@@ -361,6 +365,44 @@ class EventsFactory extends Factory {
       }
       : {};
 
+    /**
+     * Sentinel values from garage assignee filter (not user ids)
+     */
+    const FILTER_UNASSIGNED = '__filter_unassigned__';
+    const FILTER_ANY_ASSIGNEE = '__filter_any_assignee__';
+
+    const assigneeFilter = (() => {
+      if (!assignee) {
+        return {};
+      }
+      if (assignee === FILTER_UNASSIGNED) {
+        /**
+         * Use $and so this does not collide with searchFilter’s top-level $or in $match spread
+         */
+        return {
+          $and: [
+            {
+              $or: [
+                { 'event.assignee': { $exists: false } },
+                { 'event.assignee': null },
+                { 'event.assignee': '' },
+              ],
+            },
+          ],
+        };
+      }
+      if (assignee === FILTER_ANY_ASSIGNEE) {
+        return {
+          'event.assignee': {
+            $exists: true,
+            $nin: [null, ''],
+          },
+        };
+      }
+
+      return { 'event.assignee': String(assignee) };
+    })();
+
     pipeline.push(
       /**
        * Left outer join original event on groupHash field
@@ -398,6 +440,7 @@ class EventsFactory extends Factory {
           ...matchFilter,
           ...searchFilter,
           ...releaseFilter,
+          ...assigneeFilter,
         },
       },
       { $limit: limit + 1 },

src/resolvers/billingNew.ts

@@ -86,6 +86,7 @@ export default {
       currency: string;
       checksum: string;
       nextPaymentDate: Date;
+      cloudPaymentsPublicId: string;
     }> {
       const { workspaceId, tariffPlanId, shouldSaveCard } = input;
 
@@ -178,6 +179,7 @@ debug: ${Boolean(workspace.isDebug)}`
         currency: 'RUB',
         checksum,
         nextPaymentDate,
+        cloudPaymentsPublicId: process.env.CLOUDPAYMENTS_PUBLIC_ID || '',
       };
     },
   },

src/resolvers/project.js

@@ -20,6 +20,54 @@ const GROUPING_TIMESTAMP_INDEX_NAME = 'groupingTimestamp';
 const GROUPING_TIMESTAMP_AND_LAST_REPETITION_TIME_AND_ID_INDEX_NAME = 'groupingTimestampAndLastRepetitionTimeAndId';
 const GROUPING_TIMESTAMP_AND_GROUP_HASH_INDEX_NAME = 'groupingTimestampAndGroupHash';
 const MAX_SEARCH_QUERY_LENGTH = 50;
+const FALLBACK_EVENT_TITLE = 'Unknown';
+
+/**
+ * Ensures each daily event has non-empty payload title
+ * and writes warning log with identifiers when fallback is used.
+ *
+ * @param {object} dailyEventsPortion - portion returned by events factory
+ * @param {string|ObjectId} projectId - project id for logs
+ * @returns {object}
+ */
+function normalizeDailyEventsPayloadTitle(dailyEventsPortion, projectId) {
+  if (!dailyEventsPortion || !Array.isArray(dailyEventsPortion.dailyEvents)) {
+    return dailyEventsPortion;
+  }
+
+  dailyEventsPortion.dailyEvents = dailyEventsPortion.dailyEvents.map((dailyEvent) => {
+    const event = dailyEvent && dailyEvent.event ? dailyEvent.event : null;
+    const payload = event && event.payload ? event.payload : null;
+    const hasValidTitle = payload &&
+      typeof payload.title === 'string' &&
+      payload.title.trim().length > 0;
+
+    if (hasValidTitle) {
+      return dailyEvent;
+    }
+
+    console.warn('🔴🔴🔴 [ProjectResolver.dailyEventsPortion] Missing event payload title. Fallback title applied.', {
+      projectId: projectId ? projectId.toString() : null,
+      dailyEventId: dailyEvent && dailyEvent.id ? dailyEvent.id.toString() : null,
+      dailyEventGroupHash: dailyEvent && dailyEvent.groupHash ? dailyEvent.groupHash.toString() : null,
+      eventOriginalId: event && event.originalEventId ? event.originalEventId.toString() : null,
+      eventId: event && event._id ? event._id.toString() : null,
+    });
+
+    return {
+      ...dailyEvent,
+      event: {
+        ...(event || {}),
+        payload: {
+          ...(payload || {}),
+          title: FALLBACK_EVENT_TITLE,
+        },
+      },
+    };
+  });
+
+  return dailyEventsPortion;
+}
 
 /**
  * See all types and fields here {@see ../typeDefs/project.graphql}
@@ -571,19 +619,21 @@ module.exports = {
     },
 
     /**
-     * Returns recent Events grouped by day
-     *
-     * @param {ProjectDBScheme} project - result of parent resolver
-     * @param {Number} limit - limit for events count
-     * @param {DailyEventsCursor} cursor - object with boundary values of the first event in the next portion
-     * @param {'BY_DATE' | 'BY_COUNT'} sort - events sort order
-     * @param {EventsFilters} filters - marks by which events should be filtered
-     * @param {String} release - release name
-     * @param {String} search - search query
+     * Returns a paginated portion of daily-grouped events
      *
-     * @return {Promise<RecentEventSchema[]>}
+     * @param {ProjectDBScheme} project - parent resolver result
+     * @param {object} args - GraphQL arguments
+     * @param {number} args.limit - max rows in portion
+     * @param {object|null} args.nextCursor - pagination cursor
+     * @param {string} args.sort - BY_DATE | BY_COUNT | BY_AFFECTED_USERS (mapped in factory)
+     * @param {object} args.filters - mark filters only: resolved, starred, ignored (assignee uses args.assignee)
+     * @param {string} args.search - search query
+     * @param {string|undefined} args.release - optional release label filter
+     * @param {string|undefined} args.assignee - user id or __filter_unassigned__ / __filter_any_assignee__
+     * @param {object} context - GraphQL context
+     * @returns {Promise<object>} dailyEventsPortion payload from factory
      */
-    async dailyEventsPortion(project, { limit, nextCursor, sort, filters, search, release }, context) {
+    async dailyEventsPortion(project, { limit, nextCursor, sort, filters, search, release, assignee }, context) {
       if (search) {
         if (search.length > MAX_SEARCH_QUERY_LENGTH) {
           search = search.slice(0, MAX_SEARCH_QUERY_LENGTH);
@@ -592,7 +642,17 @@ module.exports = {
 
       const factory = getEventsFactory(context, project._id);
 
-      const dailyEventsPortion = await factory.findDailyEventsPortion(limit, nextCursor, sort, filters, search, release);
+      const dailyEventsPortion = await factory.findDailyEventsPortion(
+        limit,
+        nextCursor,
+        sort,
+        filters,
+        search,
+        release,
+        assignee
+      );
+
+      normalizeDailyEventsPayloadTitle(dailyEventsPortion, project._id);
 
       return dailyEventsPortion;
     },

src/resolvers/workspace.js

@@ -436,7 +436,8 @@ module.exports = {
 
       const defaultPlan = await factories.plansFactory.getDefaultPlan();
 
-      if (workspaceModel.tariffPlanId === defaultPlan.id) {
+      // Prevent re-applying the free plan if workspace is already on it.
+      if (workspaceModel.tariffPlanId.toString() === defaultPlan._id.toString()) {
         throw new UserInputError('You already use default plan');
       }
 

src/typeDefs/billing.ts

@@ -270,6 +270,11 @@ type ComposePaymentResponse {
   Next payment date (recurrent start)
   """
   nextPaymentDate: DateTime!
+
+  """
+  CloudPayments public id (merchant identifier for payment widget)
+  """
+  cloudPaymentsPublicId: String!
 }
 
 

src/typeDefs/project.ts

@@ -347,6 +347,11 @@ type Project {
     Release label to filter events by payload.release
     """
     release: String
+
+    """
+    Filter by assignee: workspace user id, or sentinels __filter_unassigned__ (no assignee) / __filter_any_assignee__ (has assignee)
+    """
+    assignee: ID
   ): DailyEventsPortion
 
   """