Correção deletar em cascata e configurações build

Arthur-Neto · Aug 31, 2020 · 2ec831c · 2ec831c
1 parent fb1178b
commit 2ec831c
Show file tree

Hide file tree

Showing 11 changed files with 79 additions and 54 deletions.
diff --git a/src/api/Theater.Application/MoviesModule/MovieService.cs b/src/api/Theater.Application/MoviesModule/MovieService.cs
@@ -40,7 +40,7 @@ public async Task<int> CreateAsync(MovieCreateCommand command)
 
         public async Task<bool> DeleteAsync(int id)
         {
-            var movie = await _repository.SingleOrDefaultAsync(x => x.ID == id);
+            var movie = await _repository.SingleOrDefaultAsync(x => x.ID == id, true, p => p.Sessions);
             Guard.Against(movie, ErrorType.NotFound);
 
             await _repository.DeleteAsync(id);

diff --git a/src/api/Theater.Infra.Data.EF/Configurations/MoviesModule/MovieConfiguration.cs b/src/api/Theater.Infra.Data.EF/Configurations/MoviesModule/MovieConfiguration.cs
@@ -40,6 +40,10 @@ public void Configure(EntityTypeBuilder<Movie> builder)
             builder.Property(u => u.AudioType)
                 .HasColumnType("smallint")
                 .IsRequired();
+
+            builder.HasMany(p => p.Sessions)
+                .WithOne(p => p.Movie)
+                .OnDelete(DeleteBehavior.Cascade);
         }
     }
 }
diff --git a/src/api/Theater.Infra.Data.EF/Configurations/RoomsModule/RoomConfiguration.cs b/src/api/Theater.Infra.Data.EF/Configurations/RoomsModule/RoomConfiguration.cs
@@ -24,7 +24,7 @@ public void Configure(EntityTypeBuilder<Room> builder)
 
             builder.HasMany(p => p.Sessions)
                 .WithOne(p => p.Room)
-                .OnDelete(DeleteBehavior.Restrict);
+                .OnDelete(DeleteBehavior.Cascade);
         }
     }
 }
diff --git a/src/api/Theater.Infra.Data.EF/Configurations/SessionsModule/SessionConfiguration.cs b/src/api/Theater.Infra.Data.EF/Configurations/SessionsModule/SessionConfiguration.cs
@@ -19,11 +19,13 @@ public void Configure(EntityTypeBuilder<Session> builder)
 
             builder.HasOne(p => p.Movie)
                 .WithMany(p => p.Sessions)
-                .HasForeignKey(p => p.MovieId);
+                .HasForeignKey(p => p.MovieId)
+                .OnDelete(DeleteBehavior.Cascade);
 
             builder.HasOne(p => p.Room)
                 .WithMany(p => p.Sessions)
-                .HasForeignKey(p => p.RoomId);
+                .HasForeignKey(p => p.RoomId)
+                .OnDelete(DeleteBehavior.Cascade);
         }
     }
 }
diff --git a/src/api/Theater.WebApi/ClientApp/package-lock.json b/src/api/Theater.WebApi/ClientApp/package-lock.json
diff --git a/src/api/Theater.WebApi/ClientApp/package.json b/src/api/Theater.WebApi/ClientApp/package.json
@@ -15,17 +15,17 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "10.0.9",
+    "@angular/animations": "10.0.14",
     "@angular/cdk": "^10.1.3",
-    "@angular/common": "10.0.9",
-    "@angular/compiler": "10.0.9",
-    "@angular/core": "10.0.9",
-    "@angular/forms": "10.0.9",
+    "@angular/common": "10.0.14",
+    "@angular/compiler": "10.0.14",
+    "@angular/core": "10.0.14",
+    "@angular/forms": "10.0.14",
     "@angular/material": "^10.1.3",
-    "@angular/platform-browser": "10.0.9",
-    "@angular/platform-browser-dynamic": "10.0.9",
+    "@angular/platform-browser": "10.0.14",
+    "@angular/platform-browser-dynamic": "10.0.14",
     "@angular/platform-server": "^10.0.14",
-    "@angular/router": "10.0.9",
+    "@angular/router": "10.0.14",
     "@nguniversal/express-engine": "^10.0.2",
     "@nguniversal/module-map-ngfactory-loader": "8.2.6",
     "aspnet-prerendering": "^3.0.1",
@@ -37,7 +37,7 @@
     "oidc-client": "^1.10.1",
     "popper.js": "^1.16.1",
     "rxjs": "^6.6.2",
-    "zone.js": "0.10.3"
+    "zone.js": "0.11.1"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^0.1000.8",
@@ -48,17 +48,17 @@
     "@types/express": "^4.17.7",
     "@types/jasmine": "^3.5.14",
     "@types/jasminewd2": "~2.0.8",
-    "@types/node": "~14.0.27",
+    "@types/node": "~14.6.2",
     "codelyzer": "^6.0.0",
     "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~5.0.2",
     "karma": "^5.1.1",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage-istanbul-reporter": "~3.0.3",
-    "karma-jasmine": "~3.3.1",
+    "karma-jasmine": "~4.0.1",
     "karma-jasmine-html-reporter": "^1.5.4",
     "parse5": "^6.0.1",
-    "typescript": "3.9.7"
+    "typescript": "^3.9.6"
   },
   "optionalDependencies": {
     "node-sass": "^4.14.1",

diff --git a/src/api/Theater.WebApi/ClientApp/src/app/modules/rooms/rooms-list/rooms-list.component.ts b/src/api/Theater.WebApi/ClientApp/src/app/modules/rooms/rooms-list/rooms-list.component.ts
@@ -105,5 +105,7 @@ export class RoomsListComponent implements OnInit {
         if (error.match('RoomWithSession')) {
             this.snackBar.open(`Room included in a session`);
         }
+
+        this.isLoading = false;
     }
 }
diff --git a/...heater.WebApi/ClientApp/src/app/modules/sessions/sessions-list/sessions-list.component.ts b/...heater.WebApi/ClientApp/src/app/modules/sessions/sessions-list/sessions-list.component.ts
@@ -108,5 +108,7 @@ export class SessionsListComponent implements OnInit {
         if (error.match('SessionLessThanTenDaysToStart')) {
             this.snackBar.open(`Can't delete session with less than 10 days to start`);
         }
+
+        this.isLoading = false;
     }
 }
diff --git a/src/api/Theater.WebApi/ClientApp/src/environments/environment.prod.ts b/src/api/Theater.WebApi/ClientApp/src/environments/environment.prod.ts
@@ -1,4 +1,4 @@
 export const environment = {
     production: true,
-    apiUrl: 'http://localhost:5001/',
+    apiUrl: 'http://localhost:5000/',
 };
diff --git a/src/api/Theater.WebApi/Properties/launchSettings.json b/src/api/Theater.WebApi/Properties/launchSettings.json
@@ -15,6 +15,10 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
+    },
+    "Production": {
+      "commandName": "IISExpress",
+      "launchBrowser": true
     }
   }
 }
diff --git a/src/api/Theater.WebApi/Startup.cs b/src/api/Theater.WebApi/Startup.cs
@@ -104,6 +104,8 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             app.UseSpa(spa =>
             {
                 spa.Options.SourcePath = "ClientApp";
+
+                spa.ApplicationBuilder.UseCors("TheaterCorsPolicy");
             });
         }
     }