Seed data (#471)

#470 Refactor data seeding

Author: thiennn

Dockerfile

@@ -45,7 +45,6 @@ RUN apt-get update \
 WORKDIR /app	
 COPY --from=build-env /app/src/SimplCommerce.WebHost/out ./
 COPY --from=build-env /app/src/SimplCommerce.WebHost/dbscript.sql ./
-COPY --from=build-env /app/src/Database/StaticData_PostgreSQL.sql ./
 
 COPY --from=build-env /app/docker-entrypoint.sh /
 RUN chmod 755 /docker-entrypoint.sh

README.md

@@ -25,12 +25,10 @@ http://demo.simplcommerce.com
 
 #### Steps to run
 
-- Create a database in SQL Server
 - Update the connection string in appsettings.json in SimplCommerce.WebHost
 - Build whole solution.
 - In the Task Runner Explorer, right click on the "copy-modules" task and Run.
 - Open Package Manager Console Window and type "Update-Database" then press "Enter". This action will create database schema.
-- Execute src/Database/StaticData.sql on the created database to insert seed data.
 - In Visual Studio, press "Control + F5".
 - The back-office can access via /Admin using the pre-created account: [email protected], 1qazZAQ!
 
@@ -44,10 +42,8 @@ http://demo.simplcommerce.com
 
 #### Steps to run
 
-- Create a database in PostgreSQL.
 - Update the connection string in appsettings.json in SimplCommerce.WebHost.
 - Run file "sudo ./simpl-build.sh".
-- Execute src/Database/StaticData_Postgres.sql on the created database to insert seed data.
 - In the terminal, navigate to the "src/SimplCommerce.WebHost" type "dotnet run" and hit "Enter".
 - Open browser, open http://localhost:5000. The back-office can access via /Admin using the pre-created account: [email protected], 1qazZAQ!
 

docker-entrypoint.sh

@@ -7,7 +7,6 @@ else
     echo "create new database simplcommerce"
 	psql -h simpldb --username postgres -c "CREATE DATABASE simplcommerce WITH ENCODING 'UTF8'"
 	psql -h simpldb --username postgres -d simplcommerce -a -f /app/dbscript.sql
-	psql -h simpldb --username postgres -d simplcommerce -a -f /app/StaticData_PostgreSQL.sql
 fi
 
 cd /app && dotnet SimplCommerce.WebHost.dll 

src/Modules/SimplCommerce.Module.ActivityLog/Controllers/MostViewedEntityController.cs

@@ -21,7 +21,7 @@ public MostViewedEntityController(IActivityTypeRepository activityTypeRepository
         }
 
         [HttpGet("most-viewed-entities/{entityTypeId}")]
-        public async Task<IList<MostViewEntityDto>> GetMostViewedEntities(long entityTypeId)
+        public async Task<IList<MostViewEntityDto>> GetMostViewedEntities(string entityTypeId)
         {
             return await _activityTypeRepository.List().Where(x => x.EntityTypeId == entityTypeId).Take(10).ToListAsync();
         }

src/Modules/SimplCommerce.Module.ActivityLog/Data/ActivityLogCustomModelBuilder.cs

@@ -0,0 +1,14 @@
+using Microsoft.EntityFrameworkCore;
+using SimplCommerce.Infrastructure.Data;
+using SimplCommerce.Module.ActivityLog.Models;
+
+namespace SimplCommerce.Module.ActivityLog.Data
+{
+    public class ActivityLogCustomModelBuilder : ICustomModelBuilder
+    {
+        public void Build(ModelBuilder modelBuilder)
+        {
+            modelBuilder.Entity<ActivityType>().HasData(new ActivityType(1) { Name = "EntityView" });
+        }
+    }
+}

src/Modules/SimplCommerce.Module.ActivityLog/Models/Activity.cs

@@ -15,6 +15,6 @@ public class Activity : EntityBase
 
         public long EntityId { get; set; }
 
-        public long EntityTypeId { get; set; }
+        public string EntityTypeId { get; set; }
     }
 }

src/Modules/SimplCommerce.Module.ActivityLog/Models/ActivityType.cs

@@ -4,6 +4,11 @@ namespace SimplCommerce.Module.ActivityLog.Models
 {
     public class ActivityType : EntityBase
     {
+        public ActivityType (long id)
+        {
+            Id = id;
+        }
+
         public string Name { get; set; }
     }
 }

src/Modules/SimplCommerce.Module.ActivityLog/Models/MostViewEntityDto.cs

@@ -1,15 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace SimplCommerce.Module.ActivityLog.Models
+namespace SimplCommerce.Module.ActivityLog.Models
 {
     public class MostViewEntityDto
     {
         public long EntityId { get; set; }
 
-        public long EntityTypeId { get; set; }
+        public string EntityTypeId { get; set; }
 
         public string Name { get; set; }
 

src/Modules/SimplCommerce.Module.ActivityLog/wwwroot/admin/most-viewed-products.directive.js

@@ -22,7 +22,7 @@
         vm.translate = translateService;
         vm.products = [];
 
-        activityLogService.getMostViewedEntities(3).then(function (result) {
+        activityLogService.getMostViewedEntities("Product").then(function (result) {
             vm.products = result.data;
         });
     }

src/Modules/SimplCommerce.Module.Catalog/Controllers/CategoryWidgetApiController.cs

@@ -13,12 +13,10 @@ namespace SimplCommerce.Module.Catalog.Controllers
     public class CategoryWidgetApiController : Controller
     {
         private readonly IRepository<WidgetInstance> _widgetInstanceRepository;
-        private readonly IRepository<Widget> _widgetRespository;
 
-        public CategoryWidgetApiController(IRepository<WidgetInstance> widgetInstanceRepository, IRepository<Widget> widgetRespository)
+        public CategoryWidgetApiController(IRepository<WidgetInstance> widgetInstanceRepository)
         {
             _widgetInstanceRepository = widgetInstanceRepository;
-            _widgetRespository = widgetRespository;
         }
 
         [HttpGet("{id}")]
@@ -47,7 +45,7 @@ public IActionResult Post([FromBody] CategoryWidgetForm model)
                 var widgetInstance = new WidgetInstance
                 {
                     Name = model.Name,
-                    WidgetId = 4,
+                    WidgetId = "CategoryWidget",
                     WidgetZoneId = model.WidgetZoneId,
                     PublishStart = model.PublishStart,
                     PublishEnd = model.PublishEnd,
@@ -59,7 +57,7 @@ public IActionResult Post([FromBody] CategoryWidgetForm model)
                 _widgetInstanceRepository.SaveChanges();
                 return Ok();
             }
-            return new BadRequestObjectResult(ModelState);
+            return BadRequest(ModelState);
         }
 
         [HttpPut("{id}")]
@@ -78,7 +76,7 @@ public IActionResult Put(long id, [FromBody] CategoryWidgetForm model)
                 return Ok();
             }
 
-            return new BadRequestObjectResult(ModelState);
+            return BadRequest(ModelState);
         }
     }
 }