Skip to content

Commit 908c482

Browse files
ugurcanerdoganugurcanerdogan
committed
FULL CLEANUP AND REFACTOR
1 parent ab05711 commit 908c482

File tree

106 files changed

+2216
-2528
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+2216
-2528
lines changed

‎ConsoleUI/ConsoleUI.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<ProjectReference Include="..\DataAccess\DataAccess.csproj" />
10-
<ProjectReference Include="..\Entities\Entities.csproj" />
11-
<ProjectReference Include="..\Service\Service.csproj" />
9+
<ProjectReference Include="..\DataAccess\DataAccess.csproj"/>
10+
<ProjectReference Include="..\Entities\Entities.csproj"/>
11+
<ProjectReference Include="..\Service\Service.csproj"/>
1212
</ItemGroup>
1313

1414
</Project>

‎ConsoleUI/Program.cs

+14-16
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
1-
using System;
2-
using DataAccess.Concrete.EntityFramework;
3-
using DataAccess.Concrete.InMemory;
4-
using Entities.Concrete;
5-
using Service.Concrete;
1+
using DataAccess.Concrete.EntityFramework;
62
using Service.Concrete.Managers;
73

84
namespace ConsoleUI
95
{
10-
class Program
6+
internal class Program
117
{
12-
static void Main(string[] args)
8+
private static void Main(string[] args)
139
{
14-
InternManager _internManager = new InternManager(new EfInternDal());
15-
JuniorSoftwareDeveloperManager _juniorSoftwareDeveloperManager = new JuniorSoftwareDeveloperManager(new EfJuniorSoftwareDeveloperDal());
16-
ProjectManagerManager _projectManager = new ProjectManagerManager(new EfProjectManagerDal());
17-
QAEngineerManager _qaEngineerManager = new QAEngineerManager(new EfQAEngineerDal());
18-
SeniorSoftwareDeveloperManager _seniorSoftwareDeveloperManager = new SeniorSoftwareDeveloperManager(new EfSeniorSoftwareDeveloperDal());
19-
SoftwareDeveloperManager _softwareDeveloperManager = new SoftwareDeveloperManager(new EfSoftwareDeveloperDal());
20-
SystemAnalystManager _systemAnalystManager = new SystemAnalystManager(new EfSystemAnalystDal());
21-
TestEngineerManager _testEngineerManager = new TestEngineerManager(new EfTestEngineerDal());
22-
UIDesignerManager _uiDesignerManager = new UIDesignerManager(new EfUIDesignerDal());
10+
var _internManager = new InternManager(new EfInternDal());
11+
var _juniorSoftwareDeveloperManager =
12+
new JuniorSoftwareDeveloperManager(new EfJuniorSoftwareDeveloperDal());
13+
var _projectManager = new ProjectManagerManager(new EfProjectManagerDal());
14+
var _qaEngineerManager = new QAEngineerManager(new EfQAEngineerDal());
15+
var _seniorSoftwareDeveloperManager =
16+
new SeniorSoftwareDeveloperManager(new EfSeniorSoftwareDeveloperDal());
17+
var _softwareDeveloperManager = new SoftwareDeveloperManager(new EfSoftwareDeveloperDal());
18+
var _systemAnalystManager = new SystemAnalystManager(new EfSystemAnalystDal());
19+
var _testEngineerManager = new TestEngineerManager(new EfTestEngineerDal());
20+
var _uiDesignerManager = new UIDesignerManager(new EfUIDesignerDal());
2321

2422
// Intern intern = _internManager.GetById(1);
2523
// Console.WriteLine("First : " + intern.FirstName);

‎Core/Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.11" />
8+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.11"/>
99
</ItemGroup>
1010

1111
</Project>

‎Core/DataAccess/EntityFramework/EfEntityRepositoryBase.cs

+10-9
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,29 @@
77

88
namespace Core.DataAccess.EntityFramework
99
{
10-
public class EfEntityRepositoryBase<TEntity,TContext>: IEntityRepository<TEntity>
11-
where TEntity: class, IEntity, new()
12-
where TContext: DbContext, new()
10+
public class EfEntityRepositoryBase<TEntity, TContext> : IEntityRepository<TEntity>
11+
where TEntity : class, IEntity, new()
12+
where TContext : DbContext, new()
1313
{
1414
public List<TEntity> GetAll(Expression<Func<TEntity, bool>> filter = null)
1515
{
16-
using (TContext context = new TContext())
16+
using (var context = new TContext())
1717
{
1818
return filter == null ? context.Set<TEntity>().ToList() : context.Set<TEntity>().Where(filter).ToList();
1919
}
2020
}
2121

2222
public TEntity Get(Expression<Func<TEntity, bool>> filter)
2323
{
24-
using (TContext context = new TContext())
24+
using (var context = new TContext())
2525
{
2626
return context.Set<TEntity>().SingleOrDefault(filter);
2727
}
2828
}
2929

3030
public void Add(TEntity entity)
3131
{
32-
using (TContext context = new TContext())
32+
using (var context = new TContext())
3333
{
3434
var addedEntity = context.Entry(entity);
3535
addedEntity.State = EntityState.Added;
@@ -39,16 +39,17 @@ public void Add(TEntity entity)
3939

4040
public void Update(TEntity entity)
4141
{
42-
using (TContext context = new TContext())
42+
using (var context = new TContext())
4343
{
4444
var updatedEntity = context.Entry(entity);
4545
updatedEntity.State = EntityState.Modified;
4646
context.SaveChanges();
47-
} }
47+
}
48+
}
4849

4950
public void Delete(TEntity entity)
5051
{
51-
using (TContext context = new TContext())
52+
using (var context = new TContext())
5253
{
5354
var deletedEntity = context.Entry(entity);
5455
deletedEntity.State = EntityState.Deleted;

‎Core/DataAccess/EntityRepositories/IEntityRepository.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
namespace Core.DataAccess.EntityRepositories
66
{
7-
public interface IEntityRepository<T> where T:class,IEntity,new()
7+
public interface IEntityRepository<T> where T : class, IEntity, new()
88
{
9-
List<T> GetAll(Expression<Func<T,bool>> filter=null);
10-
T Get(Expression<Func<T,bool>> filter);
9+
List<T> GetAll(Expression<Func<T, bool>> filter = null);
10+
T Get(Expression<Func<T, bool>> filter);
1111
void Add(T entity);
1212
void Update(T entity);
1313
void Delete(T entity);

‎Core/IEntity.cs

-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
{
33
public interface IEntity
44
{
5-
65
}
76
}

‎DataAccess/Abstract/IInternDal.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
using System.Collections.Generic;
2-
using Core.DataAccess;
32
using Core.DataAccess.EntityRepositories;
43
using Entities.Concrete;
54
using Entities.DTOs;
65

76
namespace DataAccess.Abstract
8-
{
9-
public interface IInternDal: IEntityRepository<Intern>
7+
{
8+
public interface IInternDal : IEntityRepository<Intern>
109
{
1110
List<InternDetailDto> GetInternDetails();
1211
}

‎DataAccess/Abstract/IJuniorSoftwareDeveloperDal.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
using System.Collections.Generic;
2-
using Core.DataAccess;
32
using Core.DataAccess.EntityRepositories;
43
using Entities.Concrete;
54
using Entities.DTOs;
65

76
namespace DataAccess.Abstract
87
{
9-
public interface IJuniorSoftwareDeveloperDal: IEntityRepository<JuniorSoftwareDeveloper>
8+
public interface IJuniorSoftwareDeveloperDal : IEntityRepository<JuniorSoftwareDeveloper>
109
{
1110
List<JuniorSoftwareDeveloperDto> GetJuniorSoftwareDeveloperDetails();
1211
}

‎DataAccess/Abstract/IPositionDal.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
using System.Collections.Generic;
2-
using Core.DataAccess;
3-
using Core.DataAccess.EntityRepositories;
1+
using Core.DataAccess.EntityRepositories;
42
using Entities.Concrete;
53

64
namespace DataAccess.Abstract
75
{
8-
public interface IPositionDal: IEntityRepository<Position>
6+
public interface IPositionDal : IEntityRepository<Position>
97
{
108
}
119
}

‎DataAccess/Abstract/IProjectManagerDal.cs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
using System.Collections.Generic;
2-
using Core.DataAccess;
3-
using Core.DataAccess.EntityRepositories;
1+
using Core.DataAccess.EntityRepositories;
42
using Entities.Concrete;
53

64
namespace DataAccess.Abstract
75
{
8-
public interface IProjectManagerDal: IEntityRepository<ProjectManager>
6+
public interface IProjectManagerDal : IEntityRepository<ProjectManager>
97
{
108
}
119
}

‎DataAccess/Abstract/IQAEngineerDal.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
using System.Collections.Generic;
2-
using Core.DataAccess;
32
using Core.DataAccess.EntityRepositories;
43
using Entities.Concrete;
54
using Entities.DTOs;
65

76
namespace DataAccess.Abstract
87
{
9-
public interface IQAEngineerDal: IEntityRepository<QAEngineer>
8+
public interface IQAEngineerDal : IEntityRepository<QAEngineer>
109
{
1110
List<QAEngineerDto> GetQAEngineerDetails();
1211
}

‎DataAccess/Abstract/ISeniorSoftwareDeveloperDal.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
using System.Collections.Generic;
2-
using Core.DataAccess;
32
using Core.DataAccess.EntityRepositories;
43
using Entities.Concrete;
54
using Entities.DTOs;
65

76
namespace DataAccess.Abstract
87
{
9-
public interface ISeniorSoftwareDeveloperDal: IEntityRepository<SeniorSoftwareDeveloper>
8+
public interface ISeniorSoftwareDeveloperDal : IEntityRepository<SeniorSoftwareDeveloper>
109
{
1110
List<SeniorSoftwareDeveloperDto> GetSeniorSoftwareDeveloperDetails();
1211
}

‎DataAccess/Abstract/ISoftwareDeveloperDal.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
using System.Collections.Generic;
2-
using Core.DataAccess;
32
using Core.DataAccess.EntityRepositories;
43
using Entities.Concrete;
54
using Entities.DTOs;
65

76
namespace DataAccess.Abstract
87
{
9-
public interface ISoftwareDeveloperDal: IEntityRepository<SoftwareDeveloper>
8+
public interface ISoftwareDeveloperDal : IEntityRepository<SoftwareDeveloper>
109
{
1110
List<SoftwareDeveloperDto> GetSoftwareDeveloperDetails();
1211
}

‎DataAccess/Abstract/ISystemAnalystDal.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
using System.Collections.Generic;
2-
using Core.DataAccess;
32
using Core.DataAccess.EntityRepositories;
43
using Entities.Concrete;
54
using Entities.DTOs;
65

76
namespace DataAccess.Abstract
87
{
9-
public interface ISystemAnalystDal: IEntityRepository<SystemAnalyst>
8+
public interface ISystemAnalystDal : IEntityRepository<SystemAnalyst>
109
{
1110
List<SystemAnalystDto> GetSystemAnalystDetails();
1211
}

‎DataAccess/Abstract/ITestEngineerDal.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
using System.Collections.Generic;
2-
using Core.DataAccess;
32
using Core.DataAccess.EntityRepositories;
43
using Entities.Concrete;
54
using Entities.DTOs;
65

76
namespace DataAccess.Abstract
87
{
9-
public interface ITestEngineerDal: IEntityRepository<TestEngineer>
8+
public interface ITestEngineerDal : IEntityRepository<TestEngineer>
109
{
1110
List<TestEngineerDto> GetTestEngineerDetails();
1211
}

‎DataAccess/Abstract/IUIDesignerDal.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
using System.Collections.Generic;
2-
using Core.DataAccess;
32
using Core.DataAccess.EntityRepositories;
43
using Entities.Concrete;
54
using Entities.DTOs;
65

76
namespace DataAccess.Abstract
87
{
9-
public interface IUIDesignerDal: IEntityRepository<UIDesigner>
8+
public interface IUIDesignerDal : IEntityRepository<UIDesigner>
109
{
1110
List<UIDesignerDto> GetUIDesignerDetails();
1211
}

‎DataAccess/Concrete/EntityFramework/EfInternDal.cs

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
1-
using System;
2-
using System.Collections.Generic;
1+
using System.Collections.Generic;
32
using System.Linq;
4-
using System.Linq.Expressions;
53
using Core.DataAccess.EntityFramework;
64
using DataAccess.Abstract;
75
using Entities.Concrete;
86
using Entities.DTOs;
9-
using Microsoft.EntityFrameworkCore;
107

118
namespace DataAccess.Concrete.EntityFramework
129
{
13-
public class EfInternDal: EfEntityRepositoryBase<Intern,EmployeeContext>,IInternDal
10+
public class EfInternDal : EfEntityRepositoryBase<Intern, EmployeeContext>, IInternDal
1411
{
1512
public List<InternDetailDto> GetInternDetails()
1613
{
17-
using (EmployeeContext context = new EmployeeContext())
14+
using (var context = new EmployeeContext())
1815
{
1916
var result = from i in context.Interns
2017
join s in context.SoftwareDevelopers

‎DataAccess/Concrete/EntityFramework/EfJuniorSoftwareDeveloperDal.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77

88
namespace DataAccess.Concrete.EntityFramework
99
{
10-
public class EfJuniorSoftwareDeveloperDal : EfEntityRepositoryBase<JuniorSoftwareDeveloper,EmployeeContext>,IJuniorSoftwareDeveloperDal
10+
public class EfJuniorSoftwareDeveloperDal : EfEntityRepositoryBase<JuniorSoftwareDeveloper, EmployeeContext>,
11+
IJuniorSoftwareDeveloperDal
1112
{
1213
public List<JuniorSoftwareDeveloperDto> GetJuniorSoftwareDeveloperDetails()
1314
{
14-
using (EmployeeContext context = new EmployeeContext())
15+
using (var context = new EmployeeContext())
1516
{
1617
var result = from j in context.JuniorSoftwareDevelopers
1718
join s in context.SeniorSoftwareDevelopers

‎DataAccess/Concrete/EntityFramework/EfPositionDal.cs

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq.Expressions;
4-
using Core.DataAccess.EntityFramework;
1+
using Core.DataAccess.EntityFramework;
52
using DataAccess.Abstract;
63
using Entities.Concrete;
74

85
namespace DataAccess.Concrete.EntityFramework
96
{
10-
public class EfPositionDal : EfEntityRepositoryBase<Position,EmployeeContext>,IPositionDal
7+
public class EfPositionDal : EfEntityRepositoryBase<Position, EmployeeContext>, IPositionDal
118
{
12-
139
}
1410
}

‎DataAccess/Concrete/EntityFramework/EfProjectManagerDal.cs

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq.Expressions;
4-
using Core.DataAccess.EntityFramework;
1+
using Core.DataAccess.EntityFramework;
52
using DataAccess.Abstract;
63
using Entities.Concrete;
74

85
namespace DataAccess.Concrete.EntityFramework
96
{
10-
public class EfProjectManagerDal : EfEntityRepositoryBase<ProjectManager,EmployeeContext>,IProjectManagerDal
7+
public class EfProjectManagerDal : EfEntityRepositoryBase<ProjectManager, EmployeeContext>, IProjectManagerDal
118
{
12-
139
}
1410
}

‎DataAccess/Concrete/EntityFramework/EfQAEngineerDal.cs

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
1-
using System;
2-
using System.Collections.Generic;
1+
using System.Collections.Generic;
32
using System.Linq;
4-
using System.Linq.Expressions;
53
using Core.DataAccess.EntityFramework;
64
using DataAccess.Abstract;
75
using Entities.Concrete;
86
using Entities.DTOs;
9-
using Microsoft.EntityFrameworkCore;
107

118
namespace DataAccess.Concrete.EntityFramework
129
{
13-
public class EfQAEngineerDal : EfEntityRepositoryBase<QAEngineer,EmployeeContext>,IQAEngineerDal
10+
public class EfQAEngineerDal : EfEntityRepositoryBase<QAEngineer, EmployeeContext>, IQAEngineerDal
1411
{
1512
public List<QAEngineerDto> GetQAEngineerDetails()
1613
{
17-
using (EmployeeContext context = new EmployeeContext())
14+
using (var context = new EmployeeContext())
1815
{
1916
var result = from q in context.QAEngineers
2017
join p in context.ProjectManagers
2118
on q.ManagerId.Value equals p.Id
22-
select new QAEngineerDto()
19+
select new QAEngineerDto
2320
{
2421
Id = q.Id,
2522
ManagerId = p.Id,

0 commit comments

Comments
 (0)