Merge branch 'main' into feat/user-notification-show-at

Author: capJavert

__tests__/workers/feedbackClassify.ts

@@ -164,4 +164,24 @@ describe('feedbackClassify worker', () => {
     expect(mockClassifyUserFeedback).not.toHaveBeenCalled();
     expect(mockCreateFeedbackIssue).not.toHaveBeenCalled();
   });
+
+  it('should keep new category values when creating Linear issue', async () => {
+    const feedback = await con.getRepository(Feedback).save({
+      userId: '1',
+      category: 7,
+      description: 'Content quality feedback',
+      status: FeedbackStatus.Pending,
+      flags: {},
+    });
+
+    await expectSuccessfulTypedBackground<'api.v1.feedback-created'>(worker, {
+      feedbackId: feedback.id,
+    });
+
+    expect(mockCreateFeedbackIssue).toHaveBeenCalledWith(
+      expect.objectContaining({
+        category: 7,
+      }),
+    );
+  });
 });

__tests__/workers/feedbackUpdatedSlack.ts

@@ -235,4 +235,34 @@ describe('feedbackUpdatedSlack worker', () => {
     expect(updated?.flags?.slackNotifiedAt).toBeUndefined();
     expect(postMessageMock).toHaveBeenCalledTimes(1);
   });
+
+  it('should render new category display names in slack notification', async () => {
+    const feedback = await con.getRepository(Feedback).save({
+      userId: '1',
+      category: 7,
+      description: 'Content quality feedback',
+      status: FeedbackStatus.Accepted,
+      flags: {},
+    });
+
+    await expectSuccessfulTypedBackground<'api.v1.feedback-updated'>(worker, {
+      feedbackId: feedback.id,
+    });
+
+    expect(postMessageMock).toHaveBeenCalledTimes(1);
+    const [{ blocks }] = postMessageMock.mock.calls[0];
+    const categoryBlock = blocks?.find((block) => {
+      if (block.type !== 'section' || !('fields' in block)) {
+        return false;
+      }
+
+      return block.fields?.some(
+        (field) =>
+          field.type === 'mrkdwn' &&
+          field.text === '*Category:*\nContent Quality',
+      );
+    });
+
+    expect(categoryBlock).toBeDefined();
+  });
 });

package.json

@@ -37,7 +37,7 @@
     "@connectrpc/connect-fastify": "^1.6.1",
     "@connectrpc/connect-node": "^1.6.1",
     "@dailydotdev/graphql-redis-subscriptions": "^2.4.3",
-    "@dailydotdev/schema": "0.2.73",
+    "@dailydotdev/schema": "0.2.74",
     "@dailydotdev/ts-ioredis-pool": "^1.0.2",
     "@fastify/cookie": "^11.0.2",
     "@fastify/cors": "^11.2.0",

pnpm-lock.yaml

@@ -3,19 +3,32 @@ import {
   UserFeedbackSentiment,
 } from '@dailydotdev/schema';
 
+const categoryDisplayNames: Record<number, string> = {
+  [UserFeedbackCategory.BUG]: 'Bug Report',
+  [UserFeedbackCategory.FEATURE_REQUEST]: 'Feature Request',
+  [UserFeedbackCategory.GENERAL]: 'General Feedback',
+  [UserFeedbackCategory.OTHER]: 'Other',
+  [UserFeedbackCategory.UX_ISSUE]: 'UX Issue',
+  [UserFeedbackCategory.PERFORMANCE]: 'Performance',
+  [UserFeedbackCategory.CONTENT_QUALITY]: 'Content Quality',
+};
+
+const categoryLabelNames: Record<number, string> = {
+  [UserFeedbackCategory.BUG]: 'bug',
+  [UserFeedbackCategory.FEATURE_REQUEST]: 'feature-request',
+  [UserFeedbackCategory.GENERAL]: 'general',
+  [UserFeedbackCategory.OTHER]: 'other',
+  [UserFeedbackCategory.UX_ISSUE]: 'ux-issue',
+  [UserFeedbackCategory.PERFORMANCE]: 'performance',
+  [UserFeedbackCategory.CONTENT_QUALITY]: 'content-quality',
+};
+
 export const getCategoryDisplayName = (category: number): string => {
-  switch (category) {
-    case UserFeedbackCategory.BUG:
-      return 'Bug Report';
-    case UserFeedbackCategory.FEATURE_REQUEST:
-      return 'Feature Request';
-    case UserFeedbackCategory.GENERAL:
-      return 'General Feedback';
-    case UserFeedbackCategory.OTHER:
-      return 'Other';
-    default:
-      return 'Feedback';
-  }
+  return categoryDisplayNames[category] ?? 'Feedback';
+};
+
+export const getCategoryLabelName = (category: number): string => {
+  return categoryLabelNames[category] ?? 'unknown';
 };
 
 export const getSentimentEmoji = (sentiment?: string): string => {

src/common/feedback.ts

@@ -1,7 +1,8 @@
-import { UserFeedbackCategory } from '@dailydotdev/schema';
 import { z } from 'zod';
 
-export const feedbackCategorySchema = z.enum(UserFeedbackCategory);
+const feedbackCategories = [0, 1, 2, 3, 4, 5, 6, 7] as const;
+
+export const feedbackCategorySchema = z.literal(feedbackCategories);
 
 export const feedbackInputSchema = z.object({
   category: feedbackCategorySchema,

src/common/schema/feedback.ts

@@ -1,6 +1,5 @@
 import { LinearClient } from '@linear/sdk';
 import {
-  UserFeedbackCategory,
   UserFeedbackSentiment,
   UserFeedbackTeam,
   UserFeedbackUrgency,
@@ -10,6 +9,7 @@ import type { FeedbackClassification } from '../../entity/Feedback';
 import { GarmrService, IGarmrClient } from '../garmr';
 import {
   getCategoryDisplayName,
+  getCategoryLabelName,
   getSentimentEmoji,
 } from '../../common/feedback';
 
@@ -63,21 +63,6 @@ interface CreateFeedbackIssueResult {
 const mapUrgencyToPriority = (urgency?: string): number =>
   Number(urgency) || UserFeedbackUrgency.MEDIUM;
 
-const getCategoryLabelName = (category: number): string => {
-  switch (category) {
-    case UserFeedbackCategory.BUG:
-      return 'bug';
-    case UserFeedbackCategory.FEATURE_REQUEST:
-      return 'feature-request';
-    case UserFeedbackCategory.GENERAL:
-      return 'general';
-    case UserFeedbackCategory.OTHER:
-      return 'other';
-    default:
-      return 'unknown';
-  }
-};
-
 const getUrgencyDisplayName = (urgency?: string): string => {
   switch (Number(urgency)) {
     case UserFeedbackUrgency.CRITICAL:

src/integrations/linear/index.ts

@@ -21,7 +21,7 @@ export const typeDefs = /* GraphQL */ `
   """
   input FeedbackInput {
     """
-    Category of feedback (BUG, FEATURE_REQUEST, GENERAL, OTHER)
+    Category of feedback (BUG, FEATURE_REQUEST, GENERAL, OTHER, UX_ISSUE, PERFORMANCE, CONTENT_QUALITY)
     """
     category: ProtoEnumValue!