clean project registry before create new project (microsoft#2716)

lei9444 · Apr 21, 2020 · 212e4f6 · 212e4f6
1 parent dd7f39f
commit 212e4f6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/Composer/packages/server/src/controllers/project.ts b/Composer/packages/server/src/controllers/project.ts
@@ -44,6 +44,7 @@ async function createProject(req: Request, res: Response) {
   log('Attempting to create project at %s', path);
 
   try {
+    await BotProjectService.cleanProject(locationRef);
     const newProjRef = await AssectService.manager.copyProjectTemplateTo(templateId, locationRef, user);
     const id = await BotProjectService.openProject(newProjRef, user);
     const currentProject = await BotProjectService.getProjectById(id, user);

diff --git a/Composer/packages/server/src/services/project.ts b/Composer/packages/server/src/services/project.ts
@@ -159,6 +159,16 @@ export class BotProjectService {
     return projectId.toString();
   };
 
+  // clean project registry based on path to avoid reuseing the same id
+  public static cleanProject = async (location: LocationRef): Promise<void> => {
+    for (const key in BotProjectService.projectLocationMap) {
+      if (BotProjectService.projectLocationMap[key] === location.path) {
+        delete BotProjectService.projectLocationMap[key];
+      }
+    }
+    Store.set('projectLocationMap', BotProjectService.projectLocationMap);
+  };
+
   public static generateProjectId = async (path: string): Promise<string> => {
     const projectId = (Math.random() * 100000).toString();
     BotProjectService.projectLocationMap[projectId] = path;