move around dsareport mutation/services/etc

server/src/core/server/data/context.ts

@@ -4,7 +4,7 @@ import { Config } from "coral-server/config";
 import { CommentAction } from "coral-server/models/action/comment";
 import { CommentModerationAction } from "coral-server/models/action/moderation/comment";
 import { Comment } from "coral-server/models/comment";
-import { DSAReport } from "coral-server/models/dsaReport/comment";
+import { DSAReport } from "coral-server/models/dsaReport/report";
 import { createCollection } from "coral-server/models/helpers";
 import { Invite } from "coral-server/models/invite";
 import { MigrationRecord } from "coral-server/models/migration";

server/src/core/server/graph/mutators/Comments.ts

@@ -6,7 +6,7 @@ import { hasTag } from "coral-server/models/comment";
 import { addTag, removeTag } from "coral-server/services/comments";
 import {
   createDontAgree,
-  createDSAReport,
+  // createDSAReport,
   createFlag,
   createReaction,
   removeDontAgree,
@@ -29,7 +29,7 @@ import {
   GQLCreateCommentInput,
   GQLCreateCommentReactionInput,
   GQLCreateCommentReplyInput,
-  GQLCreateDSAReportInput,
+  // GQLCreateDSAReportInput,
   GQLEditCommentInput,
   GQLFeatureCommentInput,
   GQLMarkCommentsAsSeenInput,
@@ -208,20 +208,6 @@ export const Comments = (ctx: GraphContext) => ({
       ctx.now,
       ctx.req
     ),
-  createDSAReport: ({
-    commentID,
-    userID,
-    lawBrokenDescription,
-    additionalInformation,
-    submissionID,
-  }: GQLCreateDSAReportInput) =>
-    createDSAReport(ctx.mongo, ctx.tenant, {
-      commentID,
-      userID,
-      lawBrokenDescription,
-      additionalInformation,
-      submissionID,
-    }),
   feature: async ({
     commentID,
     commentRevisionID,

server/src/core/server/graph/mutators/DSAReports.ts

@@ -0,0 +1,21 @@
+import GraphContext from "coral-server/graph/context";
+import { createDSAReport } from "coral-server/services/dsaReports/reports";
+
+import { GQLCreateDSAReportInput } from "coral-server/graph/schema/__generated__/types";
+
+export const DSAReports = (ctx: GraphContext) => ({
+  createDSAReport: ({
+    commentID,
+    userID,
+    lawBrokenDescription,
+    additionalInformation,
+    submissionID,
+  }: GQLCreateDSAReportInput) =>
+    createDSAReport(ctx.mongo, ctx.tenant, {
+      commentID,
+      userID,
+      lawBrokenDescription,
+      additionalInformation,
+      submissionID,
+    }),
+});

server/src/core/server/graph/mutators/index.ts

@@ -2,6 +2,7 @@ import GraphContext from "coral-server/graph/context";
 
 import { Actions } from "./Actions";
 import { Comments } from "./Comments";
+import { DSAReports } from "./DSAReports";
 import { Redis } from "./Redis";
 import { Settings } from "./Settings";
 import { Sites } from "./Sites";
@@ -11,6 +12,7 @@ import { Users } from "./Users";
 const root = (ctx: GraphContext) => ({
   Actions: Actions(ctx),
   Comments: Comments(ctx),
+  DSAReports: DSAReports(ctx),
   Settings: Settings(ctx),
   Stories: Stories(ctx),
   Users: Users(ctx),

server/src/core/server/graph/resolvers/Mutation.ts

@@ -68,7 +68,7 @@ export const Mutation: Required<GQLMutationTypeResolver<void>> = {
     clientMutationId: input.clientMutationId,
   }),
   createDSAReport: async (source, { input }, ctx) => ({
-    dsaReport: await ctx.mutators.Comments.createDSAReport(input),
+    dsaReport: await ctx.mutators.DSAReports.createDSAReport(input),
     clientMutationId: input.clientMutationId,
   }),
   featureComment: async (

server/src/core/server/models/dsaReport/comment.ts → server/src/core/server/models/dsaReport/report.ts

@@ -5,6 +5,8 @@ import { MongoContext } from "coral-server/data/context";
 import { FilterQuery } from "coral-server/models/helpers";
 import { TenantResource } from "coral-server/models/tenant";
 
+import { GQLDSAReportStatus } from "coral-server/graph/schema/__generated__/types";
+
 export interface DSAReport extends TenantResource {
   readonly id: string;
 
@@ -21,16 +23,18 @@ export interface DSAReport extends TenantResource {
   submissionID?: string;
 
   publicID: string;
+
+  status: GQLDSAReportStatus;
 }
 
 export type CreateDSAReportInput = Omit<
   DSAReport,
-  "id" | "tenantID" | "createdAt" | "publicID"
+  "id" | "tenantID" | "createdAt" | "publicID" | "status"
 >;
 
 export interface CreateDSAReportResultObject {
   /**
-   * action contains the resultant DSAReport that was created.
+   * dsaReport contains the resultant DSAReport that was created.
    */
   dsaReport: DSAReport;
 }
@@ -60,6 +64,7 @@ export async function createDSAReport(
     tenantID,
     createdAt: now,
     publicID,
+    status: GQLDSAReportStatus.AWAITING_REVIEW,
   };
 
   // Extract the filter parameters.

server/src/core/server/services/comments/actions.ts

@@ -23,7 +23,6 @@ import {
   updateCommentActionCounts,
 } from "coral-server/models/comment";
 import { getLatestRevision } from "coral-server/models/comment/helpers";
-import { createDSAReport as createReport } from "coral-server/models/dsaReport/comment";
 import { retrieveSite } from "coral-server/models/site";
 import { Tenant } from "coral-server/models/tenant";
 import { User } from "coral-server/models/user";
@@ -473,22 +472,3 @@ export async function createFlag(
 
   return comment;
 }
-
-export interface CreateDSAReportInput {
-  commentID: string;
-  userID: string;
-  lawBrokenDescription: string;
-  additionalInformation: string;
-  submissionID?: string;
-}
-
-export async function createDSAReport(
-  mongo: MongoContext,
-  tenant: Tenant,
-  input: CreateDSAReportInput,
-  now = new Date()
-) {
-  const result = await createReport(mongo, tenant.id, input, now);
-  const { dsaReport } = result;
-  return dsaReport;
-}

server/src/core/server/services/dsaReports/reports.ts

@@ -0,0 +1,22 @@
+import { MongoContext } from "coral-server/data/context";
+import { createDSAReport as createReport } from "coral-server/models/dsaReport/report";
+import { Tenant } from "coral-server/models/tenant";
+
+export interface CreateDSAReportInput {
+  commentID: string;
+  userID: string;
+  lawBrokenDescription: string;
+  additionalInformation: string;
+  submissionID?: string;
+}
+
+export async function createDSAReport(
+  mongo: MongoContext,
+  tenant: Tenant,
+  input: CreateDSAReportInput,
+  now = new Date()
+) {
+  const result = await createReport(mongo, tenant.id, input, now);
+  const { dsaReport } = result;
+  return dsaReport;
+}