From 1deb2ef1da72cb11f2afff80ba1104e3c45b0ff4 Mon Sep 17 00:00:00 2001
From: Mohab <mohab_sobhy@outlook.com>
Date: Wed, 1 Apr 2026 21:22:57 +0200
Subject: [PATCH] Fix duplicate project names for the same user

---
 .../project-form-create/project-form-create.component.html | 4 ++++
 .../project-form-create/project-form-create.component.ts   | 7 +++++++
 src/Analysim.Web/Controllers/ProjectController.cs          | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Analysim.Web/ClientApp/src/app/projects/project-create/project-form-create/project-form-create.component.html b/src/Analysim.Web/ClientApp/src/app/projects/project-create/project-form-create/project-form-create.component.html
index 7d1162c1..b3273d65 100644
--- a/src/Analysim.Web/ClientApp/src/app/projects/project-create/project-form-create/project-form-create.component.html
+++ b/src/Analysim.Web/ClientApp/src/app/projects/project-create/project-form-create/project-form-create.component.html
@@ -31,6 +31,10 @@
     </div>
 
     <!-- Form Create Project -->
+    <div *ngIf="submitErrorMessage" class="form-group mb-2">
+        <div class="alert alert-danger mb-0" role="alert">{{ submitErrorMessage }}</div>
+    </div>
+
     <div class="form-group mb-0">
         <button id="success-btn"  type="submit" class="btn btn-success btn-block" value="Submit" [disabled]="projectForm.invalid">
             <div *ngIf="!isLoading">
diff --git a/src/Analysim.Web/ClientApp/src/app/projects/project-create/project-form-create/project-form-create.component.ts b/src/Analysim.Web/ClientApp/src/app/projects/project-create/project-form-create/project-form-create.component.ts
index 76a1fe08..52471dab 100644
--- a/src/Analysim.Web/ClientApp/src/app/projects/project-create/project-form-create/project-form-create.component.ts
+++ b/src/Analysim.Web/ClientApp/src/app/projects/project-create/project-form-create/project-form-create.component.ts
@@ -29,6 +29,7 @@ export class ProjectFormCreateComponent implements OnInit {
   currentUser$ : Observable<User>
   currentUser : User
   isLoading : boolean
+  submitErrorMessage: string
 
   @Output() setProject = new EventEmitter<Project>()
 
@@ -37,6 +38,7 @@ export class ProjectFormCreateComponent implements OnInit {
       this.router.navigate(['/login'], {queryParams: {returnUrl : this.router.url}})
 
     this.isLoading = false;
+    this.submitErrorMessage = '';
 
     await this.accountService.currentUser.then((x) => this.currentUser$ = x)
     this.currentUser$.subscribe(x => this.currentUser = x)
@@ -80,11 +82,16 @@ export class ProjectFormCreateComponent implements OnInit {
 
   onSubmit() {
     let projectForm = this.projectForm.value;
+    this.submitErrorMessage = '';
+    this.isLoading = true;
 
     this.projectService.createProject(this.currentUser, projectForm.name, projectForm.visibility, projectForm.description).subscribe(
       result =>{
+        this.isLoading = false;
         this.setProject.emit(result)
       },error =>{
+        this.isLoading = false;
+        this.submitErrorMessage = error?.error?.message || 'Failed to create project.';
         console.log(error)
       }
     )
diff --git a/src/Analysim.Web/Controllers/ProjectController.cs b/src/Analysim.Web/Controllers/ProjectController.cs
index f4d01fb6..9ad1aafe 100644
--- a/src/Analysim.Web/Controllers/ProjectController.cs
+++ b/src/Analysim.Web/Controllers/ProjectController.cs
@@ -700,7 +700,7 @@ public async Task<IActionResult> CreateProject([FromForm] ProjectVM formdata)
             // Check if the project already exists
             bool projectExists = await _dbContext.Projects
                 .AnyAsync(p => p.ProjectUsers.Any(aup =>
-                    aup.User.Id == formdata.UserID &&
+                    aup.UserID == userId &&
                     aup.Project.Name == formdata.Name &&
                     aup.UserRole == "owner"));