Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 5345cff

Browse files
committed
fix: user edit
1 parent 99a6448 commit 5345cff

File tree

2 files changed

+84
-83
lines changed

2 files changed

+84
-83
lines changed

‎BusinessEntityLayer/UserModel.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class UserModel
1919
public Nullable<System.DateTime> LoginTime { get; set; }
2020
public Nullable<int> LoginId { get; set; }
2121

22-
public Nullable<int> SalaryId { get; set; }
22+
//public Nullable<int> SalaryId { get; set; }
2323

2424
//======================
2525
public string Name { get; set; }
@@ -35,7 +35,7 @@ public class UserModel
3535

3636
//[JsonIgnore]
3737
//public virtual ICollection<MywatchlistModel> Mywatchlists { get; set; }
38-
public virtual SalaryModel Salary { get; set; }
38+
// public virtual SalaryModel Salary { get; set; }
3939

4040
//[JsonIgnore]
4141
//public virtual ICollection<SubscriptionModel> Subscriptions { get; set; }
Lines changed: 82 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,29 @@
1-
using AutoMapper;
2-
using BusinessEntityLayer;
3-
using DataAccessLayer;
4-
using DataAccessLayer.EntityFramework;
5-
using System;
6-
using System.Collections.Generic;
7-
using System.Linq;
8-
using System.Text;
9-
using System.Threading.Tasks;
1+
using AutoMapper;
2+
using BusinessEntityLayer;
3+
using DataAccessLayer;
4+
using DataAccessLayer.EntityFramework;
5+
using System;
6+
using System.Collections.Generic;
7+
using System.Linq;
8+
using System.Text;
9+
using System.Threading.Tasks;
1010

11-
namespace BusinessLogicLayer.Services
11+
namespace BusinessLogicLayer.Services
12+
{
13+
public class UserService
1214
{
13-
public classUserService
15+
public staticList<UserModel>Get()
1416
{
15-
public static List<UserModel> Get()
17+
var data = DataAccessFactory.UserDataAccess().Get();
18+
var users = new List<UserModel>();
19+
foreach (var item in data)
1620
{
17-
var data = DataAccessFactory.UserDataAccess().Get();
18-
var users = new List<UserModel>();
19-
foreach (var item in data)
20-
{
21-
var usr = new UserModel()
22-
{
23-
Id = item.Id,
24-
LoginId = item.LoginId,
25-
Name = item.Login.Name,
26-
Email = item.Login.Email,
27-
Role = item.Login.Role,
28-
Phone = item.Phone,
29-
DOB = item.DOB,
30-
Address1 = item.Address1,
31-
Address2 = item.Address2,
32-
Status = item.Status,
33-
AccountCreateTime = item.AccountCreateTime,
34-
LoginTime = item.LoginTime
35-
};
36-
users.Add(usr);
37-
}
38-
return users;
39-
}
40-
41-
public static UserModel Get(int id)
42-
{
43-
var item = DataAccessFactory.UserDataAccess().Get(id);
44-
var user = new UserModel()
21+
var usr = new UserModel()
4522
{
4623
Id = item.Id,
4724
LoginId = item.LoginId,
4825
Name = item.Login.Name,
4926
Email = item.Login.Email,
50-
Password = item.Login.Password,
5127
Role = item.Login.Role,
5228
Phone = item.Phone,
5329
DOB = item.DOB,
@@ -57,53 +33,78 @@ public static UserModel Get(int id)
5733
AccountCreateTime = item.AccountCreateTime,
5834
LoginTime = item.LoginTime
5935
};
60-
returnuser;
36+
users.Add(usr);
6137
}
38+
return users;
39+
}
6240

63-
public static void Create(UserModel u)
41+
public static UserModel Get(int id)
42+
{
43+
var item = DataAccessFactory.UserDataAccess().Get(id);
44+
var user = new UserModel()
6445
{
65-
var config = new MapperConfiguration(c =>
66-
{
67-
c.CreateMap<UserModel, User>();
68-
});
69-
var mapper = new Mapper(config);
70-
var data = mapper.Map<User>(u);
71-
var isCreated = DataAccessFactory.UserDataAccess().Create(data);
72-
if (!isCreated) throw new Exception("User not created");
73-
}
46+
Id = item.Id,
47+
LoginId = item.LoginId,
48+
Name = item.Login.Name,
49+
Email = item.Login.Email,
50+
Password = item.Login.Password,
51+
Role = item.Login.Role,
52+
Phone = item.Phone,
53+
DOB = item.DOB,
54+
Address1 = item.Address1,
55+
Address2 = item.Address2,
56+
Status = item.Status,
57+
AccountCreateTime = item.AccountCreateTime,
58+
LoginTime = item.LoginTime
59+
};
60+
return user;
61+
}
7462

75-
public static void Update(UserModel user)
63+
public static void Create(UserModel u)
64+
{
65+
var config = new MapperConfiguration(c =>
7666
{
77-
User usr = new User();
78-
Login log = new Login();
67+
c.CreateMap<UserModel, User>();
68+
});
69+
var mapper = new Mapper(config);
70+
var data = mapper.Map<User>(u);
71+
var isCreated = DataAccessFactory.UserDataAccess().Create(data);
72+
if (!isCreated) throw new Exception("User not created");
73+
}
7974

80-
int loginId = Convert.ToInt32(user.LoginId);
75+
public static void Update(UserModel user)
76+
{
77+
User usr = new User();
78+
Login log = new Login();
8179

82-
usr.Id = user.Id;
83-
usr.LoginId = loginId;
84-
usr.Phone = user.Phone;
85-
usr.DOB = user.DOB;
86-
usr.Address1 = user.Address1;
87-
usr.Address2 = user.Address2;
88-
usr.Status = user.Status;
89-
usr.AccountCreateTime = user.AccountCreateTime;
90-
usr.LoginTime = user.LoginTime;
91-
92-
log.Id = loginId;
93-
log.Name = user.Name;
94-
log.Email = user.Email;
95-
log.Password = user.Password;
96-
log.Role = user.Role;
97-
98-
var isUpdatedForUser = DataAccessFactory.UserDataAccess().Update(usr);
99-
//var isUpdatedForLogin = DataAccessFactory.LoginDataAccess().Update(log);
100-
if (!isUpdatedForUser) throw new Exception("User not updated");
101-
}
80+
int loginId = Convert.ToInt32(user.LoginId);
10281

103-
public static void Delete(int id)
104-
{
105-
var isDeleted = DataAccessFactory.UserDataAccess().Delete(id);
106-
if (!isDeleted) throw new Exception("User not deleted");
107-
}
82+
usr.Id = user.Id;
83+
usr.LoginId = loginId;
84+
usr.Phone = user.Phone;
85+
usr.DOB = user.DOB;
86+
usr.Address1 = user.Address1;
87+
usr.Address2 = user.Address2;
88+
usr.Status = user.Status;
89+
usr.AccountCreateTime = user.AccountCreateTime;
90+
usr.LoginTime = user.LoginTime;
91+
92+
log.Id = loginId;
93+
log.Name = user.Name;
94+
log.Email = user.Email;
95+
log.Password = user.Password;
96+
log.Role = user.Role;
97+
98+
var isUpdatedForUser = DataAccessFactory.UserDataAccess().Update(usr);
99+
var isUpdatedForLogin = DataAccessFactory.LoginDataAccess().Update(log);
100+
if (!isUpdatedForUser) throw new Exception("User : User Model not updated");
101+
if (!isUpdatedForLogin) throw new Exception("User : Login Model not updated");
102+
}
103+
104+
public static void Delete(int id)
105+
{
106+
var isDeleted = DataAccessFactory.UserDataAccess().Delete(id);
107+
if (!isDeleted) throw new Exception("User not deleted");
108108
}
109109
}
110+
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /