Changes after rebase

w3c · Sep 28, 2023 · 703ea3c · 703ea3c
1 parent 1298314
commit 703ea3c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/server/resolvers/TestPlanReportOperations/unmarkAsFinalResolver.js b/server/resolvers/TestPlanReportOperations/unmarkAsFinalResolver.js
@@ -1,18 +1,12 @@
 const { AuthenticationError } = require('apollo-server');
-const populateData = require('../../services/PopulatedData/populateData');
 const {
-    updateTestPlanVersion
-} = require('../../models/services/TestPlanVersionService');
+    updateTestPlanReport
+} = require('../../models/services/TestPlanReportService');
+const populateData = require('../../services/PopulatedData/populateData');
 
-<<<<<<<< HEAD:server/resolvers/TestPlanReportOperations/unmarkAsFinalResolver.js
 const unmarkAsFinalResolver = async (
     { parentContext: { id: testPlanReportId } },
     _,
-========
-const updateRecommendedStatusTargetDateResolver = async (
-    { parentContext: { id: testPlanVersionId } },
-    { recommendedStatusTargetDate },
->>>>>>>> de0fe7b8 (Update query and resolvers for test plan version mutations):server/resolvers/TestPlanVersionOperations/updateRecommendedStatusTargetDateResolver.js
     context
 ) => {
     const { user } = context;
@@ -21,15 +15,9 @@ const updateRecommendedStatusTargetDateResolver = async (
         throw new AuthenticationError();
     }
 
-<<<<<<<< HEAD:server/resolvers/TestPlanReportOperations/unmarkAsFinalResolver.js
     await updateTestPlanReport(testPlanReportId, { markedFinalAt: null });
-========
-    await updateTestPlanVersion(testPlanVersionId, {
-        recommendedStatusTargetDate
-    });
->>>>>>>> de0fe7b8 (Update query and resolvers for test plan version mutations):server/resolvers/TestPlanVersionOperations/updateRecommendedStatusTargetDateResolver.js
 
-    return populateData({ testPlanVersionId }, { context });
+    return populateData({ testPlanReportId }, { context });
 };
 
 module.exports = unmarkAsFinalResolver;
diff --git a/server/tests/models/services/AtService.test.js b/server/tests/models/services/AtService.test.js
@@ -212,9 +212,17 @@ describe('AtModel Data Checks', () => {
     it('should return collection of ats with paginated structure', async () => {
         await dbCleaner(async () => {
             // A1
-            const result = await AtService.getAts('', {}, ['name'], [], [], [], {
-                enablePagination: true
-            });
+            const result = await AtService.getAts(
+                '',
+                {},
+                ['name'],
+                [],
+                [],
+                [],
+                {
+                    enablePagination: true
+                }
+            );
 
             // A3
             expect(result.data.length).toBeGreaterThanOrEqual(1);