diff --git a/.NET Core/.vs/config/applicationhost.config b/.NET Core/.vs/config/applicationhost.config
new file mode 100644
index 0000000..ba4da8f
--- /dev/null
+++ b/.NET Core/.vs/config/applicationhost.config
@@ -0,0 +1,990 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.NET Core/Documentation.txt b/.NET Core/Documentation.txt
index ffbb732..7bb4db0 100644
--- a/.NET Core/Documentation.txt
+++ b/.NET Core/Documentation.txt
@@ -3,7 +3,5 @@ Add-migration: It will scaffold the next migration for the changes you have made
Update-database: It will apply pending changes to the database based on latest scaffolding code file you created using "Add-Migration" command
example:
-Add-migration -context ApplicationDbContext
-Add-migration -context OriginContext
-update-database -context ApplicationDbContext
-update-database -context OriginContext
\ No newline at end of file
+Add-migration -context OriginDbContext
+update-database -context OriginDbContext
\ No newline at end of file
diff --git a/.NET Core/Origin/Controllers/AccountController.cs b/.NET Core/Origin/Controllers/AccountController.cs
index 1ea109b..81bb78a 100644
--- a/.NET Core/Origin/Controllers/AccountController.cs
+++ b/.NET Core/Origin/Controllers/AccountController.cs
@@ -94,6 +94,7 @@ public async Task Login(LoginRequest model, string returnUrl = nu
}
else
{
+ // TODO: Localize this fucking string
ModelState.AddModelError("Error", "Invalid login attempt.");
return View(model);
}
diff --git a/.NET Core/Origin/Controllers/ConfigurationController.cs b/.NET Core/Origin/Controllers/ConfigurationController.cs
index 3ace368..025d52e 100644
--- a/.NET Core/Origin/Controllers/ConfigurationController.cs
+++ b/.NET Core/Origin/Controllers/ConfigurationController.cs
@@ -1,12 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.IO;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Caching.Memory;
-using Origin.Models;
+using Microsoft.Extensions.Configuration;
using Origin.Service.Implementation;
-using Origin.ViewModels;
-using Origin.ViewModels.Responses;
+
namespace Origin.Controllers
{
@@ -14,14 +11,11 @@ public class ConfigurationController : Controller
{
private readonly CacheService _cacheService;
- private readonly OriginContext _context;
-
#region Constructor
- public ConfigurationController(OriginContext context, IMemoryCache cache)
+ public ConfigurationController(IMemoryCache cache)
{
- _cacheService = new CacheService(cache, ConfigurationManager.GetConfigurationByPath("Paths:Localization"));
- _context = context;
+ _cacheService = new CacheService(cache, GetConfigurationByPath("Paths:Localization"));
}
#endregion
@@ -42,100 +36,18 @@ public JsonResult GetConfiguration()
return Json(viewModel);
}
- [HttpGet]
- // TODO: Implement server side
- public JsonResult GetTables()
- {
- GetTablesResponse viewModel = new GetTablesResponse();
-
- try
- {
- if (User.IsInRole("Administrator"))
- {
- viewModel.Tables = new List()
- {
- new GetTablesResponse.Table() { Name = "OR_Forms",
- Columns = new List {
- new GetTablesResponse.Column() { Name = "Name" },
- new GetTablesResponse.Column() { Name = "Type" } } },
- new GetTablesResponse.Table() { Name = "OR_Inputs",
- Columns = new List {
- new GetTablesResponse.Column() { Name = "Name" },
- new GetTablesResponse.Column() { Name = "Type" },
- new GetTablesResponse.Column() { Name = "RelatedOriginId" } } },
- new GetTablesResponse.Table() { Name = "OR_ItemTypes",
- Columns = new List {
- new GetTablesResponse.Column() { Name = "Name" } } },
- new GetTablesResponse.Table() { Name = "OR_Lookups",
- Columns = new List {
- new GetTablesResponse.Column() { Name = "Name" },
- new GetTablesResponse.Column() { Name = "Type" } } },
- new GetTablesResponse.Table() { Name = "OR_LookupValues",
- Columns = new List {
- new GetTablesResponse.Column() { Name = "Name" },
- new GetTablesResponse.Column() { Name = "RelatedOriginId" } } },
- new GetTablesResponse.Table() { Name = "OR_Roles",
- Columns = new List {
- new GetTablesResponse.Column() { Name = "Name" } } },
- new GetTablesResponse.Table() { Name = "OR_Users",
- Columns = new List {
- new GetTablesResponse.Column() { Name = "Name" },
- new GetTablesResponse.Column() { Name = "Surname" },
- new GetTablesResponse.Column() { Name = "Email" },
- new GetTablesResponse.Column() { Name = "PhoneNumber" } } },
- };
- }
- }
- catch (Exception exc)
- {
- viewModel.ResultInfo.Result = Base.ResultInfoDto.ResultEnum.Error;
- viewModel.ResultInfo.ErrorMessage = exc.Message;
- }
+ #endregion
- return Json(viewModel);
- }
+ #region Private Methods
- [HttpPost]
- // TODO: Implement server side
- public JsonResult GetTable(string name)
+ public string GetConfigurationByPath(string path)
{
- //TODO: find a different way from a switch
- //GetTableResponse viewModel = new GetTableResponse();
+ var builder = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory()).AddJsonFile("appsettings.json");
+ IConfigurationRoot Configuration; Configuration = builder.Build();
- try
- {
- if (User.IsInRole("Administrator"))
- {
- switch(name)
- {
- case "OR_Forms":
- var forms = _context.OR_Forms.Select(f => f).ToList();
- return Json(forms);
- //break;
- case "OR_Inputs":
- break;
- case "OR_ItemTypes":
- break;
- case "OR_Lookups":
- break;
- case "OR_LookupValues":
- break;
- case "OR_Roles":
- break;
- case "OR_Users":
- break;
- }
- }
- }
- catch (Exception exc)
- {
- //viewModel.ResultInfo.Result = Base.ResultInfoDto.ResultEnum.Error;
- //viewModel.ResultInfo.ErrorMessage = exc.Message;
- }
-
- return Json(null);
- //return Json(viewModel);
+ return Configuration.GetValue(path);
}
+
#endregion
}
}
\ No newline at end of file
diff --git a/.NET Core/Origin/Controllers/ItemController.cs b/.NET Core/Origin/Controllers/ItemController.cs
index ffbe878..ac4c658 100644
--- a/.NET Core/Origin/Controllers/ItemController.cs
+++ b/.NET Core/Origin/Controllers/ItemController.cs
@@ -1,5 +1,7 @@
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
+using Origin.Models;
+using Origin.Service.Implementation;
using Origin.ViewModels.Requests;
namespace Origin.Controllers
@@ -7,7 +9,15 @@ namespace Origin.Controllers
[Authorize]
public class ItemController : Controller
{
- //IItemService service = new ItemService();
+ private readonly OriginDbContext _context;
+
+ private readonly ItemService _service;
+
+ public ItemController(OriginDbContext context)
+ {
+ _context = context;
+ _service = new ItemService(context);
+ }
//[HttpPost]
//public JsonResult AddItem(AddItemRequest request)
@@ -23,12 +33,12 @@ public class ItemController : Controller
// return Json(viewModel, JsonRequestBehavior.DenyGet);
//}
- //[HttpPost]
- //public JsonResult GetItems(GetItemsRequest request)
- //{
- // var viewModel = service.GetItems(request);
- // return Json(viewModel, JsonRequestBehavior.DenyGet);
- //}
+ [HttpPost]
+ public JsonResult GetItems(GetItemsRequest request)
+ {
+ var viewModel = _service.GetItemsToList(request);
+ return Json(viewModel);
+ }
//[HttpPost]
//public JsonResult DeleteItem(DeleteItemRequest request)
diff --git a/.NET Core/Origin/Controllers/ItemTypeController.cs b/.NET Core/Origin/Controllers/ItemTypeController.cs
new file mode 100644
index 0000000..9ca7de9
--- /dev/null
+++ b/.NET Core/Origin/Controllers/ItemTypeController.cs
@@ -0,0 +1,50 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Origin.Models;
+using Origin.Service.Implementation;
+using Origin.ViewModels.Requests;
+
+namespace Origin.Controllers
+{
+ [Authorize]
+ public class ItemTypeController : Controller
+ {
+ private readonly OriginDbContext _context;
+
+ private readonly ItemTypeService _service;
+
+ public ItemTypeController(OriginDbContext context)
+ {
+ _context = context;
+ _service = new ItemTypeService(context);
+ }
+
+ //[HttpPost]
+ //public JsonResult AddItem(AddItemRequest request)
+ //{
+ // var viewModel = service.AddItem(request);
+ // return Json(viewModel, JsonRequestBehavior.DenyGet);
+ //}
+
+ //[HttpPost]
+ //public JsonResult GetItem(GetItemRequest request)
+ //{
+ // var viewModel = service.GetItem(request);
+ // return Json(viewModel, JsonRequestBehavior.DenyGet);
+ //}
+
+ [HttpPost]
+ public JsonResult GetItemTypes(GetItemTypesRequest request)
+ {
+ var viewModel = _service.GetItemTypesToList(request);
+ return Json(viewModel);
+ }
+
+ //[HttpPost]
+ //public JsonResult DeleteItem(DeleteItemRequest request)
+ //{
+ // var viewModel = service.DeleteItems(request);
+ // return Json(viewModel, JsonRequestBehavior.DenyGet);
+ //}
+ }
+}
\ No newline at end of file
diff --git a/.NET Core/Origin/Migrations/20180104220453_Identity.Designer.cs b/.NET Core/Origin/Migrations/20180501123458_Origin.Designer.cs
similarity index 57%
rename from .NET Core/Origin/Migrations/20180104220453_Identity.Designer.cs
rename to .NET Core/Origin/Migrations/20180501123458_Origin.Designer.cs
index cee2297..9dd3ae4 100644
--- a/.NET Core/Origin/Migrations/20180104220453_Identity.Designer.cs
+++ b/.NET Core/Origin/Migrations/20180501123458_Origin.Designer.cs
@@ -6,13 +6,14 @@
using Microsoft.EntityFrameworkCore.Storage;
using Microsoft.EntityFrameworkCore.Storage.Internal;
using Origin.Models;
+using Origin.Models.Enums;
using System;
namespace Origin.Migrations
{
- [DbContext(typeof(ApplicationDbContext))]
- [Migration("20180104220453_Identity")]
- partial class Identity
+ [DbContext(typeof(OriginDbContext))]
+ [Migration("20180501123458_Origin")]
+ partial class Origin
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
@@ -21,7 +22,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
.HasAnnotation("ProductVersion", "2.0.1-rtm-125")
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b =>
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b =>
{
b.Property("Id")
.ValueGeneratedOnAdd();
@@ -30,7 +31,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
b.Property("ClaimValue");
- b.Property("RoleId");
+ b.Property("RoleId");
b.HasKey("Id");
@@ -39,7 +40,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
b.ToTable("OR_RoleClaims");
});
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b =>
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b =>
{
b.Property("Id")
.ValueGeneratedOnAdd();
@@ -48,7 +49,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
b.Property("ClaimValue");
- b.Property("UserId");
+ b.Property("UserId");
b.HasKey("Id");
@@ -57,13 +58,13 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
b.ToTable("OR_UserClaims");
});
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b =>
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b =>
{
b.Property("LoginProvider");
b.Property("ProviderKey");
- b.Property("UserId");
+ b.Property("UserId");
b.Property("ProviderDisplayName");
@@ -76,11 +77,11 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
b.ToTable("OR_UserLogins");
});
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b =>
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b =>
{
- b.Property("UserId");
+ b.Property("UserId");
- b.Property("RoleId");
+ b.Property("RoleId");
b.HasKey("UserId", "RoleId");
@@ -89,9 +90,9 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
b.ToTable("OR_UserRoles");
});
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b =>
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b =>
{
- b.Property("UserId");
+ b.Property("UserId");
b.Property("LoginProvider");
@@ -104,11 +105,154 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
b.ToTable("OR_UserTokens");
});
+ modelBuilder.Entity("Origin.Models.Store.OR_Form", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("Name");
+
+ b.Property("OriginId");
+
+ b.HasKey("Id");
+
+ b.ToTable("OR_Forms");
+ });
+
+ modelBuilder.Entity("Origin.Models.Store.OR_Input", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("FormOriginId");
+
+ b.Property("Name");
+
+ b.Property("OriginId");
+
+ b.Property("Type");
+
+ b.HasKey("Id");
+
+ b.ToTable("OR_Inputs");
+ });
+
+ modelBuilder.Entity("Origin.Models.Store.OR_Item", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("CreationDate");
+
+ b.Property("ItemTypeOriginId");
+
+ b.Property("LastEditDate");
+
+ b.Property("OriginId");
+
+ b.HasKey("Id");
+
+ b.ToTable("OR_Items");
+ });
+
+ modelBuilder.Entity("Origin.Models.Store.OR_ItemAction", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("FormOriginId");
+
+ b.Property("ItemTypeOriginId");
+
+ b.Property("Name");
+
+ b.Property("OriginId");
+
+ b.HasKey("Id");
+
+ b.ToTable("OR_ItemActions");
+ });
+
+ modelBuilder.Entity("Origin.Models.Store.OR_ItemType", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("Name");
+
+ b.Property("OriginId");
+
+ b.HasKey("Id");
+
+ b.ToTable("OR_ItemTypes");
+ });
+
+ modelBuilder.Entity("Origin.Models.Store.OR_Lookup", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("Name");
+
+ b.Property("OriginId");
+
+ b.HasKey("Id");
+
+ b.ToTable("OR_Lookups");
+ });
+
+ modelBuilder.Entity("Origin.Models.Store.OR_LookupValue", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("LookupOriginId");
+
+ b.Property("OriginId");
+
+ b.Property("Value");
+
+ b.HasKey("Id");
+
+ b.ToTable("OR_LookupValues");
+ });
+
+ modelBuilder.Entity("Origin.Models.Store.OR_Property", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("ItemTypeOriginId");
+
+ b.Property("Name");
+
+ b.Property("OriginId");
+
+ b.HasKey("Id");
+
+ b.ToTable("OR_Properties");
+ });
+
+ modelBuilder.Entity("Origin.Models.Store.OR_PropertyValue", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
+
+ b.Property("ItemOriginId");
+
+ b.Property("PropertyOriginId");
+
+ b.Property("Value");
+
+ b.HasKey("Id");
+
+ b.ToTable("OR_PropertyValues");
+ });
+
modelBuilder.Entity("Origin.Models.Store.OR_Role", b =>
{
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasDefaultValueSql("NewId()");
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
b.Property("ConcurrencyStamp")
.IsConcurrencyToken();
@@ -131,9 +275,8 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
modelBuilder.Entity("Origin.Models.Store.OR_User", b =>
{
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasDefaultValueSql("NewId()");
+ b.Property("Id")
+ .ValueGeneratedOnAdd();
b.Property("AccessFailedCount");
@@ -141,6 +284,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
.IsConcurrencyToken();
b.Property("Email")
+ .IsRequired()
.HasMaxLength(256);
b.Property("EmailConfirmed");
@@ -157,7 +301,10 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
b.Property("NormalizedUserName")
.HasMaxLength(256);
- b.Property("PasswordHash");
+ b.Property("OriginId");
+
+ b.Property("PasswordHash")
+ .IsRequired();
b.Property("PhoneNumber");
@@ -185,7 +332,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
b.ToTable("OR_Users");
});
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b =>
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b =>
{
b.HasOne("Origin.Models.Store.OR_Role")
.WithMany()
@@ -193,7 +340,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
.OnDelete(DeleteBehavior.Cascade);
});
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b =>
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b =>
{
b.HasOne("Origin.Models.Store.OR_User")
.WithMany()
@@ -201,7 +348,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
.OnDelete(DeleteBehavior.Cascade);
});
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b =>
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b =>
{
b.HasOne("Origin.Models.Store.OR_User")
.WithMany()
@@ -209,7 +356,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
.OnDelete(DeleteBehavior.Cascade);
});
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b =>
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b =>
{
b.HasOne("Origin.Models.Store.OR_Role")
.WithMany()
@@ -222,7 +369,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder)
.OnDelete(DeleteBehavior.Cascade);
});
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b =>
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b =>
{
b.HasOne("Origin.Models.Store.OR_User")
.WithMany()
diff --git a/.NET Core/Origin/Migrations/20180104220453_Identity.cs b/.NET Core/Origin/Migrations/20180501123458_Origin.cs
similarity index 53%
rename from .NET Core/Origin/Migrations/20180104220453_Identity.cs
rename to .NET Core/Origin/Migrations/20180501123458_Origin.cs
index 8f248ec..2f2300a 100644
--- a/.NET Core/Origin/Migrations/20180104220453_Identity.cs
+++ b/.NET Core/Origin/Migrations/20180501123458_Origin.cs
@@ -5,15 +5,151 @@
namespace Origin.Migrations
{
- public partial class Identity : Migration
+ public partial class Origin : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
+ migrationBuilder.CreateTable(
+ name: "OR_Forms",
+ columns: table => new
+ {
+ Id = table.Column(nullable: false)
+ .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+ Name = table.Column(nullable: true),
+ OriginId = table.Column(nullable: false)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_OR_Forms", x => x.Id);
+ });
+
+ migrationBuilder.CreateTable(
+ name: "OR_Inputs",
+ columns: table => new
+ {
+ Id = table.Column(nullable: false)
+ .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+ FormOriginId = table.Column(nullable: false),
+ Name = table.Column(nullable: true),
+ OriginId = table.Column(nullable: false),
+ Type = table.Column(nullable: false)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_OR_Inputs", x => x.Id);
+ });
+
+ migrationBuilder.CreateTable(
+ name: "OR_ItemActions",
+ columns: table => new
+ {
+ Id = table.Column(nullable: false)
+ .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+ FormOriginId = table.Column(nullable: false),
+ ItemTypeOriginId = table.Column(nullable: false),
+ Name = table.Column(nullable: true),
+ OriginId = table.Column(nullable: false)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_OR_ItemActions", x => x.Id);
+ });
+
+ migrationBuilder.CreateTable(
+ name: "OR_Items",
+ columns: table => new
+ {
+ Id = table.Column(nullable: false)
+ .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+ CreationDate = table.Column(nullable: false),
+ ItemTypeOriginId = table.Column(nullable: false),
+ LastEditDate = table.Column(nullable: false),
+ OriginId = table.Column(nullable: false)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_OR_Items", x => x.Id);
+ });
+
+ migrationBuilder.CreateTable(
+ name: "OR_ItemTypes",
+ columns: table => new
+ {
+ Id = table.Column(nullable: false)
+ .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+ Name = table.Column(nullable: true),
+ OriginId = table.Column(nullable: false)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_OR_ItemTypes", x => x.Id);
+ });
+
+ migrationBuilder.CreateTable(
+ name: "OR_Lookups",
+ columns: table => new
+ {
+ Id = table.Column(nullable: false)
+ .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+ Name = table.Column(nullable: true),
+ OriginId = table.Column(nullable: false)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_OR_Lookups", x => x.Id);
+ });
+
+ migrationBuilder.CreateTable(
+ name: "OR_LookupValues",
+ columns: table => new
+ {
+ Id = table.Column(nullable: false)
+ .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+ LookupOriginId = table.Column(nullable: false),
+ OriginId = table.Column(nullable: false),
+ Value = table.Column(nullable: true)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_OR_LookupValues", x => x.Id);
+ });
+
+ migrationBuilder.CreateTable(
+ name: "OR_Properties",
+ columns: table => new
+ {
+ Id = table.Column(nullable: false)
+ .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+ ItemTypeOriginId = table.Column(nullable: false),
+ Name = table.Column(nullable: true),
+ OriginId = table.Column(nullable: false)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_OR_Properties", x => x.Id);
+ });
+
+ migrationBuilder.CreateTable(
+ name: "OR_PropertyValues",
+ columns: table => new
+ {
+ Id = table.Column(nullable: false)
+ .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+ ItemOriginId = table.Column(nullable: false),
+ PropertyOriginId = table.Column(nullable: false),
+ Value = table.Column(nullable: true)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_OR_PropertyValues", x => x.Id);
+ });
+
migrationBuilder.CreateTable(
name: "OR_Roles",
columns: table => new
{
- Id = table.Column(nullable: false, defaultValueSql: "NewId()"),
+ Id = table.Column(nullable: false)
+ .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
ConcurrencyStamp = table.Column(nullable: true),
Name = table.Column(maxLength: 256, nullable: true),
NormalizedName = table.Column(maxLength: 256, nullable: true)
@@ -27,17 +163,19 @@ protected override void Up(MigrationBuilder migrationBuilder)
name: "OR_Users",
columns: table => new
{
- Id = table.Column(nullable: false, defaultValueSql: "NewId()"),
+ Id = table.Column(nullable: false)
+ .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
AccessFailedCount = table.Column(nullable: false),
ConcurrencyStamp = table.Column(nullable: true),
- Email = table.Column(maxLength: 256, nullable: true),
+ Email = table.Column(maxLength: 256, nullable: false),
EmailConfirmed = table.Column(nullable: false),
LockoutEnabled = table.Column(nullable: false),
LockoutEnd = table.Column(nullable: true),
Name = table.Column(nullable: true),
NormalizedEmail = table.Column(maxLength: 256, nullable: true),
NormalizedUserName = table.Column(maxLength: 256, nullable: true),
- PasswordHash = table.Column(nullable: true),
+ OriginId = table.Column(nullable: false),
+ PasswordHash = table.Column(nullable: false),
PhoneNumber = table.Column(nullable: true),
PhoneNumberConfirmed = table.Column(nullable: false),
SecurityStamp = table.Column(nullable: true),
@@ -58,7 +196,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
.Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
ClaimType = table.Column(nullable: true),
ClaimValue = table.Column(nullable: true),
- RoleId = table.Column(nullable: false)
+ RoleId = table.Column(nullable: false)
},
constraints: table =>
{
@@ -79,7 +217,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
.Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
ClaimType = table.Column(nullable: true),
ClaimValue = table.Column(nullable: true),
- UserId = table.Column(nullable: false)
+ UserId = table.Column(nullable: false)
},
constraints: table =>
{
@@ -98,7 +236,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
{
LoginProvider = table.Column(nullable: false),
ProviderKey = table.Column(nullable: false),
- UserId = table.Column(nullable: false),
+ UserId = table.Column(nullable: false),
ProviderDisplayName = table.Column(nullable: true)
},
constraints: table =>
@@ -117,8 +255,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
name: "OR_UserRoles",
columns: table => new
{
- UserId = table.Column(nullable: false),
- RoleId = table.Column(nullable: false)
+ UserId = table.Column(nullable: false),
+ RoleId = table.Column(nullable: false)
},
constraints: table =>
{
@@ -141,7 +279,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
name: "OR_UserTokens",
columns: table => new
{
- UserId = table.Column(nullable: false),
+ UserId = table.Column(nullable: false),
LoginProvider = table.Column(nullable: false),
Name = table.Column(nullable: false),
Value = table.Column(nullable: true)
@@ -199,6 +337,33 @@ protected override void Up(MigrationBuilder migrationBuilder)
protected override void Down(MigrationBuilder migrationBuilder)
{
+ migrationBuilder.DropTable(
+ name: "OR_Forms");
+
+ migrationBuilder.DropTable(
+ name: "OR_Inputs");
+
+ migrationBuilder.DropTable(
+ name: "OR_ItemActions");
+
+ migrationBuilder.DropTable(
+ name: "OR_Items");
+
+ migrationBuilder.DropTable(
+ name: "OR_ItemTypes");
+
+ migrationBuilder.DropTable(
+ name: "OR_Lookups");
+
+ migrationBuilder.DropTable(
+ name: "OR_LookupValues");
+
+ migrationBuilder.DropTable(
+ name: "OR_Properties");
+
+ migrationBuilder.DropTable(
+ name: "OR_PropertyValues");
+
migrationBuilder.DropTable(
name: "OR_RoleClaims");
diff --git a/.NET Core/Origin/Migrations/Origin/20180104221025_Identity.Designer.cs b/.NET Core/Origin/Migrations/Origin/20180104221025_Identity.Designer.cs
deleted file mode 100644
index c7c83e7..0000000
--- a/.NET Core/Origin/Migrations/Origin/20180104221025_Identity.Designer.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-//
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage;
-using Microsoft.EntityFrameworkCore.Storage.Internal;
-using Origin.Models;
-using System;
-
-namespace Origin.Migrations.Origin
-{
- [DbContext(typeof(OriginContext))]
- [Migration("20180104221025_Identity")]
- partial class Identity
- {
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasAnnotation("ProductVersion", "2.0.1-rtm-125")
- .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
- modelBuilder.Entity("Origin.Models.Store.OR_Form", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
-
- b.Property("Name");
-
- b.Property("OriginId");
-
- b.Property("Type");
-
- b.HasKey("Id");
-
- b.ToTable("OR_Forms");
- });
-
- modelBuilder.Entity("Origin.Models.Store.OR_Input", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
-
- b.Property("Name");
-
- b.Property("OriginId");
-
- b.Property("RelatedOriginId");
-
- b.Property("Type");
-
- b.HasKey("Id");
-
- b.ToTable("OR_Inputs");
- });
-
- modelBuilder.Entity("Origin.Models.Store.OR_Item", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
-
- b.Property("CreationDate");
-
- b.Property("ItemTypeOriginId");
-
- b.Property("LastEditDate");
-
- b.Property("OriginId");
-
- b.HasKey("Id");
-
- b.ToTable("OR_Items");
- });
-
- modelBuilder.Entity("Origin.Models.Store.OR_ItemAction", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
-
- b.Property("FormOriginId");
-
- b.Property("ItemTypeOriginId");
-
- b.Property("Name");
-
- b.Property("OriginId");
-
- b.HasKey("Id");
-
- b.ToTable("OR_ItemActions");
- });
-
- modelBuilder.Entity("Origin.Models.Store.OR_ItemType", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
-
- b.Property("Name");
-
- b.Property("OriginId");
-
- b.HasKey("Id");
-
- b.ToTable("OR_ItemTypes");
- });
-
- modelBuilder.Entity("Origin.Models.Store.OR_Lookup", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
-
- b.Property("Name");
-
- b.Property("OriginId");
-
- b.HasKey("Id");
-
- b.ToTable("OR_Lookups");
- });
-
- modelBuilder.Entity("Origin.Models.Store.OR_LookupValue", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
-
- b.Property("OriginId");
-
- b.Property("RelatedOriginId");
-
- b.Property("Value");
-
- b.HasKey("Id");
-
- b.ToTable("OR_LookupValues");
- });
-
- modelBuilder.Entity("Origin.Models.Store.OR_Property", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
-
- b.Property("Name");
-
- b.Property("OriginId");
-
- b.Property("RelatedOriginId");
-
- b.Property("Value");
-
- b.HasKey("Id");
-
- b.ToTable("OR_Properties");
- });
-
- modelBuilder.Entity("Origin.Models.Store.OR_RoleTable", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd();
-
- b.Property("AllowCreate");
-
- b.Property("AllowDelete");
-
- b.Property("AllowRead");
-
- b.Property("AllowUpdate");
-
- b.Property("RoleId");
-
- b.Property("TableName");
-
- b.HasKey("Id");
-
- b.ToTable("OR_RoleTables");
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/.NET Core/Origin/Migrations/Origin/20180104221025_Identity.cs b/.NET Core/Origin/Migrations/Origin/20180104221025_Identity.cs
deleted file mode 100644
index 5fd5990..0000000
--- a/.NET Core/Origin/Migrations/Origin/20180104221025_Identity.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
-
-namespace Origin.Migrations.Origin
-{
- public partial class Identity : Migration
- {
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.CreateTable(
- name: "OR_Forms",
- columns: table => new
- {
- Id = table.Column(nullable: false)
- .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
- Name = table.Column(nullable: true),
- OriginId = table.Column(nullable: false),
- Type = table.Column(nullable: true)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_OR_Forms", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "OR_Inputs",
- columns: table => new
- {
- Id = table.Column(nullable: false)
- .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
- Name = table.Column(nullable: true),
- OriginId = table.Column(nullable: false),
- RelatedOriginId = table.Column(nullable: false),
- Type = table.Column(nullable: true)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_OR_Inputs", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "OR_ItemActions",
- columns: table => new
- {
- Id = table.Column(nullable: false)
- .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
- FormOriginId = table.Column(nullable: false),
- ItemTypeOriginId = table.Column(nullable: false),
- Name = table.Column(nullable: true),
- OriginId = table.Column(nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_OR_ItemActions", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "OR_Items",
- columns: table => new
- {
- Id = table.Column(nullable: false)
- .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
- CreationDate = table.Column(nullable: false),
- ItemTypeOriginId = table.Column(nullable: false),
- LastEditDate = table.Column(nullable: false),
- OriginId = table.Column(nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_OR_Items", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "OR_ItemTypes",
- columns: table => new
- {
- Id = table.Column(nullable: false)
- .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
- Name = table.Column(nullable: true),
- OriginId = table.Column(nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_OR_ItemTypes", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "OR_Lookups",
- columns: table => new
- {
- Id = table.Column(nullable: false)
- .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
- Name = table.Column(nullable: true),
- OriginId = table.Column(nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_OR_Lookups", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "OR_LookupValues",
- columns: table => new
- {
- Id = table.Column(nullable: false)
- .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
- OriginId = table.Column(nullable: false),
- RelatedOriginId = table.Column(nullable: false),
- Value = table.Column(nullable: true)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_OR_LookupValues", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "OR_Properties",
- columns: table => new
- {
- Id = table.Column(nullable: false)
- .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
- Name = table.Column(nullable: true),
- OriginId = table.Column(nullable: false),
- RelatedOriginId = table.Column