Fix migrate v7

packages/backoffice/src/App.tsx

@@ -1,7 +1,8 @@
+import { Formio } from "@tsed/react-formio";
 import { IfSidebar, Loader, oneOfIsActive, useSidebar } from "@tsed/shared";
-import React from "react";
+import React, { useEffect } from "react";
 import { useSelector } from "react-redux";
-import { Route as DefaultRoute, Switch } from "react-router";
+import { Route as DefaultRoute, Switch, useHistory } from "react-router";
 import { useAuth } from "./auth/useAuth.hook";
 import { Config } from "./config";
 import { IfHeader } from "./header/header.component";
@@ -18,10 +19,15 @@ function App() {
   const { headerHeight } = Config;
   const { isAuth, isActive, auth, onLogout } = useAuth();
   const nav = useNav();
+  const history = useHistory();
 
   const { sidebarOpen, toggleSidebar } = useSidebar();
   const size = sidebarOpen ? "64" : "14";
 
+  useEffect(() => {
+    Formio.clearCache();
+  }, [history.location.pathname]);
+
   if (isActive) {
     return <Loader isActive={isActive} />;
   }

packages/server/coverage.json

@@ -0,0 +1,6 @@
+{
+  "statements": 89.68,
+  "branches": 70.67,
+  "functions": 79.17,
+  "lines": 89.27
+}

packages/server/jest.config.js

@@ -22,12 +22,7 @@ module.exports = {
 
   // An object that configures minimum threshold enforcement for coverage results
   coverageThreshold: {
-    global: {
-      'branches': 73.56,
-      'functions': 79.17,
-      'lines': 89.4,
-      'statements': 89.79
-    }
+    global: require('./coverage.json')
   },
 
   // An array of file extensions your modules use

packages/server/package.json

@@ -21,21 +21,26 @@
   },
   "dependencies": {
     "@octokit/rest": "18.12.0",
-    "@tsed/ajv": "6.103.2",
-    "@tsed/async-hook-context": "6.103.2",
-    "@tsed/common": "6.103.2",
-    "@tsed/core": "6.103.2",
-    "@tsed/di": "6.103.2",
-    "@tsed/exceptions": "6.103.2",
-    "@tsed/formio": "6.103.2",
-    "@tsed/json-mapper": "6.103.2",
-    "@tsed/logger": "6.1.0",
-    "@tsed/logger-logentries": "6.1.0",
-    "@tsed/mongoose": "6.103.2",
-    "@tsed/passport": "6.103.2",
-    "@tsed/platform-express": "6.103.2",
-    "@tsed/schema": "6.103.2",
-    "@tsed/swagger": "6.103.2",
+    "@tsed/ajv": "7.0.0-rc.3",
+    "@tsed/common": "7.0.0-rc.3",
+    "@tsed/core": "7.0.0-rc.3",
+    "@tsed/di": "7.0.0-rc.3",
+    "@tsed/exceptions": "7.0.0-rc.3",
+    "@tsed/formio": "7.0.0-rc.3",
+    "@tsed/json-mapper": "7.0.0-rc.3",
+    "@tsed/logger": "6.2.1",
+    "@tsed/mongoose": "7.0.0-rc.3",
+    "@tsed/passport": "7.0.0-rc.3",
+    "@tsed/platform-express": "7.0.0-rc.3",
+    "@tsed/platform-params": "7.0.0-rc.3",
+    "@tsed/platform-cache": "7.0.0-rc.3",
+    "@tsed/platform-exceptions": "7.0.0-rc.3",
+    "@tsed/platform-response-filter": "7.0.0-rc.3",
+    "@tsed/platform-middlewares": "7.0.0-rc.3",
+    "@tsed/platform-log-middleware": "7.0.0-rc.3",
+    "@tsed/platform-views": "7.0.0-rc.3",
+    "@tsed/schema": "7.0.0-rc.3",
+    "@tsed/swagger": "7.0.0-rc.3",
     "ajv": "8.10.0",
     "body-parser": "1.19.2",
     "cache-manager": "3.6.0",
@@ -58,11 +63,11 @@
     "url-parse": "1.5.10"
   },
   "devDependencies": {
-    "@tsed/cli-plugin-eslint": "3.1.0",
-    "@tsed/cli-plugin-jest": "3.1.0",
-    "@tsed/cli-plugin-mongoose": "3.1.0",
-    "@tsed/cli-plugin-passport": "3.1.0",
-    "@tsed/testing-mongoose": "6.103.2",
+    "@tsed/cli-plugin-eslint": "4.0.0-rc.1",
+    "@tsed/cli-plugin-jest": "4.0.0-rc.1",
+    "@tsed/cli-plugin-mongoose": "4.0.0-rc.1",
+    "@tsed/cli-plugin-passport": "4.0.0-rc.1",
+    "@tsed/testing-mongoose": "7.0.0-rc.3",
     "@types/cache-manager": "3.4.0",
     "@types/cache-manager-ioredis": "2.0.2",
     "@types/compression": "^1.7.0",

packages/server/src/Server.ts

@@ -1,12 +1,12 @@
 import "@tsed/ajv";
-import "@tsed/async-hook-context";
 import {PlatformApplication, Res} from "@tsed/common";
 import {Env} from "@tsed/core";
 import {Configuration, Inject} from "@tsed/di";
 import "@tsed/formio";
 import {Logger} from "@tsed/logger";
 import "@tsed/mongoose";
 import "@tsed/platform-express"; // /!\ keep this import
+import "@tsed/platform-cache";
 import "@tsed/swagger";
 import bodyParser from "body-parser";
 import compression from "compression";
@@ -18,7 +18,7 @@ import {join} from "path";
 import send from "send";
 import {cacheConfig} from "./config/cache";
 import formioConfig from "./config/formio";
-import {configureLogger, loggerConfig} from "./config/logger";
+import {loggerConfig} from "./config/logger";
 import mongooseConfig from "./config/mongoose";
 import swaggerConfig from "./config/swagger";
 import * as controllers from "./controllers/rest/index";
@@ -101,7 +101,7 @@ export class Server {
   settings: Configuration;
 
   $afterRoutesInit() {
-    this.app.get("/backoffice/*", (req: any, res: Res) => {
+    this.app.get("/backoffice/*", (req: any, res: any) => {
       res.sendFile(join(backofficeDir, "index.html"));
     });
   }
@@ -116,8 +116,4 @@ export class Server {
       });
     }
   }
-
-  $onReady() {
-    configureLogger();
-  }
 }

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

@@ -1,6 +1,5 @@
 import {isProduction} from "../env";
 import {$log} from "@tsed/common";
-import "@tsed/logger-logentries";
 
 $log.name = process.env.LOG_NAME || "API";
 
@@ -26,29 +25,3 @@ if (isProduction) {
     }
   });
 }
-
-export function configureLogger() {
-  if (process.env.LOG_ENTRIES_KEY) {
-    $log.appenders
-      .set("logentries", {
-        type: "logentries",
-        levels: ["info", "debug"],
-        layout: {
-          type: "json"
-        },
-        options: {
-          token: process.env.LOG_ENTRIES_KEY
-        }
-      })
-      .set("logentries", {
-        levels: ["trace", "fatal", "error", "warn"],
-        type: "logentries",
-        layout: {
-          type: "json"
-        },
-        options: {
-          token: process.env.LOG_ENTRIES_KEY
-        }
-      });
-  }
-}

packages/server/src/controllers/rest/__mock__/ServerTest.ts

@@ -1,7 +1,6 @@
 import "@tsed/ajv";
 import {PlatformApplication} from "@tsed/common";
 import {Configuration, Inject} from "@tsed/di";
-import "@tsed/async-hook-context";
 import "@tsed/mongoose";
 import "@tsed/platform-express"; // /!\ keep this import
 import "@tsed/swagger";

packages/server/src/controllers/rest/github/GithubCtrl.ts

@@ -1,4 +1,4 @@
-import {InjectContext} from "@tsed/async-hook-context";
+import {InjectContext} from "@tsed/di";
 import {BodyParams, Controller, Get, HeaderParams, Inject, PathParams, PlatformContext, Post, QueryParams} from "@tsed/common";
 import {array, boolean, Default, Max, Min, Name, number, object, Returns, string} from "@tsed/schema";
 import {GithubWebhookPayload} from "../../../domain/github/GithubWebhookPayload";

packages/server/src/infra/back/github/GithubClient.ts

@@ -1,7 +1,8 @@
 import {Octokit} from "@octokit/rest";
 import {RequestParameters} from "@octokit/types";
-import {InjectContext} from "@tsed/async-hook-context";
-import {PlatformContext, UseCache} from "@tsed/common";
+import {InjectContext} from "@tsed/di";
+import {PlatformContext} from "@tsed/common";
+import {UseCache} from "@tsed/platform-cache";
 import {Constant, Injectable} from "@tsed/di";
 import {Unauthorized} from "@tsed/exceptions";
 import {BaseLogClient} from "../http/BaseLogClient";

packages/server/src/infra/back/http/BaseLogClient.ts

@@ -1,6 +1,6 @@
-import {InjectContext} from "@tsed/async-hook-context";
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import {Opts, PlatformContext} from "@tsed/common";
+import {InjectContext} from "@tsed/di";
 import {get} from "lodash";
 import querystring from "querystring";
 import {logToCurl} from "./logToCurl";

packages/server/src/infra/back/http/HttpClient.ts

@@ -1,7 +1,7 @@
-import {ConverterService, Inject} from "@tsed/common";
 import {cleanObject, Type} from "@tsed/core";
 import {Injectable} from "@tsed/di";
 import {Exception} from "@tsed/exceptions";
+import {deserialize, serialize} from "@tsed/json-mapper";
 import axios, {AxiosRequestConfig, Method} from "axios";
 import {get, omit} from "lodash";
 import querystring from "querystring";
@@ -16,9 +16,6 @@ export interface HttpClientOptions extends AxiosRequestConfig, Record<string, un
 
 @Injectable()
 export class HttpClient extends BaseLogClient {
-  @Inject()
-  protected mapper: ConverterService;
-
   static getParamsSerializer(params: any) {
     return querystring.stringify(cleanObject(params));
   }
@@ -90,8 +87,8 @@ export class HttpClient extends BaseLogClient {
       method,
       url: endpoint,
       ...omit(options, ["type", "collectionType", "additionalProperties"]),
-      params: this.mapper.serialize(options.params),
-      data: this.mapper.serialize(options.data),
+      params: serialize(options.params),
+      data: serialize(options.data),
       headers: cleanObject({
         "Content-Type": "application/json",
         Accept: "application/json",
@@ -105,7 +102,7 @@ export class HttpClient extends BaseLogClient {
 
     let data = !withHeaders ? result.data : result;
 
-    data = this.mapper.deserialize(data, {
+    data = deserialize(data, {
       collectionType,
       type,
       useAlias: true,

packages/server/src/infra/back/npm/NpmClient.ts

@@ -1,6 +1,6 @@
-import {InjectContext} from "@tsed/async-hook-context";
-import {PlatformContext, UseCache} from "@tsed/common";
-import {Injectable} from "@tsed/di";
+import {PlatformContext} from "@tsed/common";
+import {UseCache} from "@tsed/platform-cache";
+import {Injectable, InjectContext} from "@tsed/di";
 import {deserialize} from "@tsed/json-mapper";
 import {Method} from "axios";
 import url from "url";

packages/server/src/infra/back/opencollective/OpenCollectiveClient.ts

@@ -1,4 +1,4 @@
-import {UseCache} from "@tsed/common";
+import {UseCache} from "@tsed/platform-cache";
 import {Injectable} from "@tsed/di";
 import {HttpClient} from "../http/HttpClient";
 

packages/server/src/infra/middlewares/https/EnsureHttpsMiddleware.ts

@@ -1,7 +1,7 @@
-import {HeaderParams, IMiddleware, Middleware, Req, Res} from "@tsed/common";
+import {HeaderParams, MiddlewareMethods, Middleware, Req, Res} from "@tsed/common";
 
 @Middleware()
-export class EnsureHttpsMiddleware implements IMiddleware {
+export class EnsureHttpsMiddleware implements MiddlewareMethods {
   use(@HeaderParams("x-forwarded-proto") protocol: string, @HeaderParams("host") host: string, @Req("url") url: string, @Res() res: Res) {
     if (protocol !== "https") {
       res.redirect(`https://${host}${url}`);

packages/server/src/migrations/repositories/RepositoriesMigration.ts

@@ -20,7 +20,7 @@ export class RepositoriesMigration {
     this.logger.info("Check repositories migration...");
     const mapper = await this.formioDatabase.getFormioMapper();
 
-    await this.formioDatabase.createFormIfNotExists(formRepositories as any, async (form) => {
+    await this.formioDatabase.importFormIfNotExists(formRepositories as any, async (form) => {
       this.logger.info('Install "Repositories" form');
       const action = mapper.mapToImport({
         ...formRepositoriesAction,

packages/server/src/migrations/user/UserMigration.ts

@@ -24,7 +24,7 @@ export class RepositoriesMigration {
     if (form && this.shouldUpdate(form as FormioForm)) {
       try {
         this.logger.info("Create form definition...");
-        await this.formioDatabase.saveFormDefinition({...userLoginForm, _id: form._id.toString()} as any);
+        await this.formioDatabase.importForm({...userLoginForm, _id: form._id.toString()} as any);
 
         const mappedAction = mapper.mapToImport({
           ...userLoginOAuthAction,

packages/server/src/migrations/warehouse/WarehouseMigration.ts

@@ -19,7 +19,8 @@ export class WarehouseMigration {
   async install() {
     this.logger.info("Check warehouse migration...");
     const mapper = await this.formioDatabase.getFormioMapper();
-    await this.formioDatabase.createFormIfNotExists(formPackages as any, async (form) => {
+
+    await this.formioDatabase.importFormIfNotExists(formPackages as any, async (form) => {
       this.logger.info('Install "NPM packages" form');
       await new this.formioDatabase.actionModel(
         mapper.mapToImport({

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

@@ -19,13 +19,11 @@ describe("FormioRepository", () => {
             _id: "id"
           })
         },
+        saveSubmission: jest.fn().mockImplementation((instance) => instance),
         submissionModel: class {
-          static findOneAndUpdate = jest.fn().mockImplementation(({_id}, instance) => {
-            return {
-              _id: _id || "newid",
-              ...instance
-            };
-          });
+          constructor(o: any) {
+            Object.assign(this, {...o, _id: o._id || "newid"});
+          }
         }
       };
 
@@ -49,11 +47,7 @@ describe("FormioRepository", () => {
         },
         form: "id"
       });
-      expect(database.submissionModel.findOneAndUpdate).toHaveBeenCalledWith(
-        {_id: undefined},
-        {data: {label: "label"}, form: "id"},
-        {upsert: true, new: true}
-      );
+      expect(database.saveSubmission).toHaveBeenCalledWith({_id: "newid", data: {label: "label"}, form: "id"});
     });
     it("should save submission", async () => {
       const database = {
@@ -62,13 +56,11 @@ describe("FormioRepository", () => {
             _id: "id"
           })
         },
+        saveSubmission: jest.fn().mockImplementation((instance) => instance),
         submissionModel: class {
-          static findOneAndUpdate = jest.fn().mockImplementation(({_id}, instance) => {
-            return {
-              _id: _id || "newid",
-              ...instance
-            };
-          });
+          constructor(o: any) {
+            Object.assign(this, {...o, _id: o._id || "newid"});
+          }
         }
       };
 
@@ -93,11 +85,7 @@ describe("FormioRepository", () => {
         },
         form: "id"
       });
-      expect(database.submissionModel.findOneAndUpdate).toHaveBeenCalledWith(
-        {_id: "id"},
-        {_id: "id", data: {label: "label"}, form: "id"},
-        {upsert: true, new: true}
-      );
+      expect(database.saveSubmission).toHaveBeenCalledWith({_id: "id", data: {label: "label"}, form: "id"});
     });
   });
   describe("getSubmissions()", () => {