fix(infra): fix repository submission

Author: Romakita

packages/server/src/config/cache/index.ts

@@ -67,7 +67,7 @@ function getConfiguration() {
       password: url.password,
       port: url.port,
       username: url.username,
-      tls: url.protocol === "rediss:",
+      tls: url.protocol === "rediss:" ? {rejectUnauthorized: false} : false,
       db: process.env.REDIS_DB_INDEX || 0,
       ...redisOptions()
     };

packages/server/src/services/FormioRepository.spec.ts

@@ -20,12 +20,12 @@ describe("FormioRepository", () => {
           })
         },
         submissionModel: class {
-          static updateOne = jest.fn().mockResolvedValue({});
-          public _id: string;
-          constructor(o: any) {
-            Object.assign(this, o);
-            this._id = o._id || "newid";
-          }
+          static findOneAndUpdate = jest.fn().mockImplementation(({_id}, instance) => {
+            return {
+              _id: _id || "newid",
+              ...instance
+            };
+          });
         }
       };
 
@@ -49,10 +49,10 @@ describe("FormioRepository", () => {
         },
         form: "id"
       });
-      expect(database.submissionModel.updateOne).toHaveBeenCalledWith(
-        {_id: "newid"},
-        {$set: {_id: "newid", data: {label: "label"}, form: "id"}},
-        {upsert: true}
+      expect(database.submissionModel.findOneAndUpdate).toHaveBeenCalledWith(
+        {_id: undefined},
+        {data: {label: "label"}, form: "id"},
+        {upsert: true, new: true}
       );
     });
     it("should save submission", async () => {
@@ -63,12 +63,12 @@ describe("FormioRepository", () => {
           })
         },
         submissionModel: class {
-          static updateOne = jest.fn().mockResolvedValue({});
-          public _id: string;
-          constructor(o: any) {
-            Object.assign(this, o);
-            this._id = o._id || "newid";
-          }
+          static findOneAndUpdate = jest.fn().mockImplementation(({_id}, instance) => {
+            return {
+              _id: _id || "newid",
+              ...instance
+            };
+          });
         }
       };
 
@@ -93,10 +93,10 @@ describe("FormioRepository", () => {
         },
         form: "id"
       });
-      expect(database.submissionModel.updateOne).toHaveBeenCalledWith(
+      expect(database.submissionModel.findOneAndUpdate).toHaveBeenCalledWith(
         {_id: "id"},
-        {$set: {_id: "id", data: {label: "label"}, form: "id"}},
-        {upsert: true}
+        {_id: "id", data: {label: "label"}, form: "id"},
+        {upsert: true, new: true}
       );
     });
   });

packages/server/src/services/FormioRepository.ts

@@ -24,20 +24,18 @@ export abstract class FormioRepository<SubmissionData = any> {
   }
 
   async saveSubmission(submission: Omit<Partial<FormioSubmission<SubmissionData>>, "form"> & {form?: any}) {
-    const instance = new this.formioDatabase.submissionModel({
-      ...submission,
+    submission = {
+      ...omit(submission, ["__v"]),
       form: submission.form || (await this.getFormId())
-    });
+    };
 
-    await this.formioDatabase.submissionModel.updateOne(
+    return this.formioDatabase.submissionModel.findOneAndUpdate(
       {
-        _id: instance._id
+        _id: submission._id
       },
-      {$set: omit(instance, ["__v"])},
-      {upsert: true}
+      submission,
+      {new: true, upsert: true}
     );
-
-    return instance;
   }
 
   async getSubmissions(): Promise<MongooseDocument<FormioSubmission<SubmissionData>>[]> {