Skip to content

Commit 2512d66

Browse files
committed
Refactored.
1 parent 944f949 commit 2512d66

File tree

6 files changed

+12
-10
lines changed

6 files changed

+12
-10
lines changed

SimpleTaskSystem/SimpleTaskSystem.Core/People/Person.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Abp.Domain.Entities;
1+
using System.ComponentModel.DataAnnotations.Schema;
2+
using Abp.Domain.Entities;
23

34
namespace SimpleTaskSystem.People
45
{
@@ -7,6 +8,7 @@ namespace SimpleTaskSystem.People
78
///
89
/// It inherits from <see cref="Entity"/> class (Optionally can implement <see cref="IEntity"/> directly).
910
/// </summary>
11+
[Table("StsPeople")]
1012
public class Person : Entity
1113
{
1214
/// <summary>

SimpleTaskSystem/SimpleTaskSystem.Core/Tasks/Task.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ namespace SimpleTaskSystem.Tasks
1717
/// Implements <see cref="IHasCreationTime"/>, thus ABP sets CreationTime automatically while saving to database.
1818
/// Also, this helps us to use standard naming and functionality for 'creation time' of entities.
1919
/// </summary>
20+
[Table("StsTasks")]
2021
public class Task : Entity<long>, IHasCreationTime
2122
{
2223
/// <summary>

SimpleTaskSystem/SimpleTaskSystem.EntityFramework/EntityFramework/SimpleTaskSystemDbContext.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,19 @@ namespace SimpleTaskSystem.EntityFramework
88
public class SimpleTaskSystemDbContext : AbpDbContext
99
{
1010
public virtual IDbSet<Task> Tasks { get; set; }
11+
1112
public virtual IDbSet<Person> People { get; set; }
1213

1314
public SimpleTaskSystemDbContext()
14-
: base("MainDb")
15+
: base("Default")
1516
{
1617

1718
}
1819

19-
protected override void OnModelCreating(DbModelBuilder modelBuilder)
20+
public SimpleTaskSystemDbContext(string nameOrConnectionString)
21+
: base(nameOrConnectionString)
2022
{
21-
base.OnModelCreating(modelBuilder);
22-
23-
modelBuilder.Entity<Person>().ToTable("StsPeople");
24-
modelBuilder.Entity<Task>().ToTable("StsTasks").HasOptional(t => t.AssignedPerson);
23+
2524
}
2625
}
2726
}

SimpleTaskSystem/SimpleTaskSystem.NHibernate/SimpleTaskSystemDataModule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class SimpleTaskSystemDataModule : AbpModule
1111
{
1212
public override void PreInitialize()
1313
{
14-
var connStr = ConfigurationManager.ConnectionStrings["MainDb"].ConnectionString;
14+
var connStr = ConfigurationManager.ConnectionStrings["Default"].ConnectionString;
1515
Configuration.Modules.AbpNHibernate().FluentConfiguration
1616
.Database(MsSqlConfiguration.MsSql2008.ConnectionString(connStr))
1717
.Mappings(m => m.FluentMappings.AddFromAssembly(Assembly.GetExecutingAssembly()));

SimpleTaskSystem/SimpleTaskSystem.WebSpaAngular/Web.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
2121
</appSettings>
2222
<connectionStrings>
23-
<add name="MainDb" connectionString="Server=localhost; Database=SimpleTaskSystemDb; Trusted_Connection=True;" providerName="System.Data.SqlClient" />
23+
<add name="Default" connectionString="Server=localhost; Database=SimpleTaskSystemDb; Trusted_Connection=True;" providerName="System.Data.SqlClient" />
2424
</connectionStrings>
2525
<system.web>
2626
<globalization culture="auto" uiCulture="auto" />

SimpleTaskSystem/SimpleTaskSystem.WebSpaDurandal/Web.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<add key="UnobtrusiveJavaScriptEnabled" value="true" />
1212
</appSettings>
1313
<connectionStrings>
14-
<add name="MainDb" connectionString="Server=localhost; Database=SimpleTaskSystemDb; Trusted_Connection=True;" />
14+
<add name="Default" connectionString="Server=localhost; Database=SimpleTaskSystemDb; Trusted_Connection=True;" />
1515
</connectionStrings>
1616
<system.web>
1717
<globalization culture="auto" uiCulture="auto" />

0 commit comments

Comments
 (0)