Skip to content

Commit 182338b

Browse files
AmarusinggithubAmarusinggithub
committed
changes
1 parent 8ae7160 commit 182338b

14 files changed

+66
-51
lines changed

‎api/Data/ApplicationDbContext.cs‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ public class ApplicationDbContext(DbContextOptions<ApplicationDbContext> options
1919
public DbSet<UserPermission> UserPermissions { get; set; }
2020

2121
public DbSet<UserGroupType> UserGroupTypes { get; set; }
22-
public DbSet<GroupMembership> GroupMemberships { get; set; }
22+
public DbSet<GroupMemberShip> GroupMemberShips { get; set; }
2323
public DbSet<Workspace> WorkSpaces { get; set; }
2424
public DbSet<WorkspaceInvitation> WorkspaceInvitations { get; set; }
2525

26-
public DbSet<WorkspaceMembership> WorkSpaceMemberships { get; set; }
26+
public DbSet<WorkspaceMemberShip> WorkSpaceMemberShips { get; set; }
2727
public DbSet<Project> Projects { get; set; }
28-
public DbSet<ProjectMembership> ProjectMemberships { get; set; }
28+
public DbSet<ProjectMemberShip> ProjectMemberShips { get; set; }
2929
public DbSet<ProjectCategory> ProjectCategories { get; set; }
3030
public DbSet<Category> Categories { get; set; }
3131
public DbSet<WorkspaceRole> WorkspaceRoles { get; set; }
@@ -35,7 +35,7 @@ public class ApplicationDbContext(DbContextOptions<ApplicationDbContext> options
3535

3636

3737
public DbSet<Notification> Notifications { get; set; }
38-
public DbSet<NotificationMembership> NotificationMemberships { get; set; }
38+
public DbSet<NotificationMemberShip> NotificationMemberShips { get; set; }
3939
public DbSet<OAuthAccount> OAuthAccounts { get; set; }
4040
public DbSet<Software> Softwares { get; set; }
4141
public DbSet<SoftwareFeature> SoftwareFeatures { get; set; }
@@ -102,15 +102,15 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
102102
//ProjectAttachment.ConfigureIndexes(modelBuilder);
103103

104104
// ProjectMembership
105-
ProjectMembership.ConfigureRelations(modelBuilder);
105+
ProjectMemberShip.ConfigureRelations(modelBuilder);
106106
//ProjectMembership.ConfigureIndexes(modelBuilder);
107107

108108
// Workspace
109109
Workspace.ConfigureRelations(modelBuilder);
110110
//Workspace.ConfigureIndexes(modelBuilder);
111111

112112
// WorkspaceMembership
113-
WorkspaceMembership.ConfigureRelations(modelBuilder);
113+
WorkspaceMemberShip.ConfigureRelations(modelBuilder);
114114
//WorkspaceMembership.ConfigureIndexes(modelBuilder);
115115

116116
// WorkspaceRole
@@ -122,7 +122,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
122122
//WorkspaceInvitation.ConfigureIndexes(modelBuilder);
123123

124124
// GroupMembership
125-
GroupMembership.ConfigureRelations(modelBuilder);
125+
GroupMemberShip.ConfigureRelations(modelBuilder);
126126
//GroupMembership.ConfigureIndexes(modelBuilder);
127127

128128
// GroupInvitation
@@ -134,7 +134,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
134134
//Resource.ConfigureIndexes(modelBuilder);
135135

136136
// NotificationMembership
137-
NotificationMembership.ConfigureRelations(modelBuilder);
137+
NotificationMemberShip.ConfigureRelations(modelBuilder);
138138
// NotificationMembership.ConfigureIndexes(modelBuilder);
139139

140140
// Include
@@ -189,6 +189,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
189189
CommentReaction.ConfigureRelations(modelBuilder);
190190
//CommentReaction.ConfigureIndexes(modelBuilder);
191191

192+
// Notification
193+
Notification.ConfigureRelations(modelBuilder);
194+
//Notification.ConfigureIndexes(modelBuilder);
195+
192196
// CommentMention
193197
CommentMention.ConfigureRelations(modelBuilder);
194198
//CommentMention.ConfigureIndexes(modelBuilder);

‎api/Models/GroupMembership.cs‎ renamed to ‎api/Models/GroupMemberShip.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace api.Models;
77

8-
public class GroupMembership
8+
public class GroupMemberShip
99
{
1010
[Key]
1111
public int Id { get; set; }
@@ -69,27 +69,27 @@ public class GroupMembership
6969

7070
public static void ConfigureRelations(ModelBuilder modelBuilder)
7171
{
72-
modelBuilder.Entity<GroupMembership>()
72+
modelBuilder.Entity<GroupMemberShip>()
7373
.HasOne(iug => iug.UserGroup)
7474
.WithMany(ug => ug.Users)
7575
.HasForeignKey(iug => iug.UserGroupId)
7676
.OnDelete(DeleteBehavior.Cascade);
7777

7878

79-
modelBuilder.Entity<GroupMembership>()
79+
modelBuilder.Entity<GroupMemberShip>()
8080
.HasOne(iug => iug.UserGroup)
8181
.WithMany(ug => ug.Users)
8282
.HasForeignKey(iug => iug.UserGroupId)
8383
.OnDelete(DeleteBehavior.Cascade);
8484

8585

86-
modelBuilder.Entity<GroupMembership>()
86+
modelBuilder.Entity<GroupMemberShip>()
8787
.HasOne(iug => iug.AddedBy)
8888
.WithMany(ug => ug.CreatedGroupMemberships)
8989
.HasForeignKey(iug => iug.AddedByUserId)
9090
.OnDelete(DeleteBehavior.Cascade);
9191

92-
modelBuilder.Entity<GroupMembership>()
92+
modelBuilder.Entity<GroupMemberShip>()
9393
.HasOne(iug => iug.User)
9494
.WithMany(u => u.GroupMemberships)
9595
.HasForeignKey(iug => iug.UserId)

‎api/Models/Notification.cs‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.ComponentModel.DataAnnotations;
22
using System.ComponentModel.DataAnnotations.Schema;
33
using api.Enums;
4+
using Microsoft.EntityFrameworkCore;
45

56
namespace api.Models;
67

@@ -77,9 +78,12 @@ public class Notification
7778
public string? SenderType { get; set; }
7879

7980

80-
public UserGroup? Group { get; set; }
8181
public Guid? GroupId { get; set; }
8282

83+
[ForeignKey(nameof(GroupId))]
84+
public UserGroup? Group { get; set; }
85+
86+
8387
public Guid? ParentNotificationId { get; set; }
8488

8589
[MaxLength(100)]
@@ -96,5 +100,17 @@ public class Notification
96100

97101
[MaxLength(50)]
98102
public string? Platform { get; set; }
99-
public ICollection<NotificationMembership> NotificationMemberships { get; set; } = new List<NotificationMembership>();
103+
public ICollection<NotificationMemberShip> NotificationMemberships { get; set; } = new List<NotificationMemberShip>();
104+
105+
106+
107+
public static void ConfigureRelations(ModelBuilder modelBuilder)
108+
{
109+
110+
}
111+
112+
public static void ConfigureIndexes(ModelBuilder modelBuilder)
113+
{
114+
115+
}
100116
}

‎api/Models/NotificationMembership.cs‎ renamed to ‎api/Models/NotificationMemberShip.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace api.Models;
77

88

99

10-
public class NotificationMembership
10+
public class NotificationMemberShip
1111
{
1212
[Key]
1313
public int Id { get; set; }
@@ -79,13 +79,13 @@ public class NotificationMembership
7979
public static void ConfigureRelations(ModelBuilder modelBuilder)
8080
{
8181

82-
modelBuilder.Entity<NotificationMembership>()
82+
modelBuilder.Entity<NotificationMemberShip>()
8383
.HasOne(u => u.User)
8484
.WithMany(u => u.NotificationMemberships)
8585
.HasForeignKey(u=> u.UserId)
8686
.OnDelete(DeleteBehavior.Cascade);
8787

88-
modelBuilder.Entity<NotificationMembership>()
88+
modelBuilder.Entity<NotificationMemberShip>()
8989
.HasOne(n => n.Notification)
9090
.WithMany(u => u.NotificationMemberships)
9191
.HasForeignKey(n=> n.NotificationId)

‎api/Models/Project.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@ public class Project
3131
public DateTime? DeletedAt { get; set; }
3232
public DateTime? LastActivityAt { get; set; }
3333
public Guid? ModifiedByUserId { get; set; }
34-
public int MemberCount => ProjectMembers?.Count(m => m.DeletedAt == null) ?? 0;
34+
35+
public ICollection<ProjectMemberShip> ProjectMemberShips { get; set; } = new List<ProjectMemberShip>();
36+
37+
public int MemberCount => ProjectMemberShips?.Count(m => m.DeletedAt == null) ?? 0;
3538

3639
public bool IsActive => Status == ProjectStatus.Active && !IsDeleted;
3740

@@ -49,10 +52,8 @@ public class Project
4952

5053
public User? CreatedBy { get; set; }
5154

52-
public ICollection<WorkspaceRole> UserProjectRoles { get; set; } = new List<WorkspaceRole>();
5355

5456

55-
public ICollection<ProjectMembership> ProjectMembers { get; set; } = new List<ProjectMembership>();
5657
public ICollection<ProjectCategory> ProjectCategories { get; set; } = new List<ProjectCategory>();
5758

5859
public ICollection<TaskItem> ProjectTasks { get; set; } = new List<TaskItem>();

‎api/Models/ProjectMembership.cs‎ renamed to ‎api/Models/ProjectMemberShip.cs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace api.Models;
66

7-
public class ProjectMembership
7+
public class ProjectMemberShip
88
{
99

1010

@@ -15,7 +15,6 @@ public class ProjectMembership
1515
[Required]
1616
public Guid UserId { get; set; }
1717
[ForeignKey(nameof(UserId))]
18-
1918
public User User { get; set; }
2019

2120
[Required]
@@ -36,19 +35,19 @@ public class ProjectMembership
3635

3736
public static void ConfigureRelations(ModelBuilder modelBuilder)
3837
{
39-
modelBuilder.Entity<ProjectMembership>()
38+
modelBuilder.Entity<ProjectMemberShip>()
4039
.HasOne(inp => inp.Project)
41-
.WithMany(p => p.ProjectMembers)
40+
.WithMany(p => p.ProjectMemberShips)
4241
.HasForeignKey(inp => inp.ProjectId)
4342
.OnDelete(DeleteBehavior.Cascade);
4443

45-
modelBuilder.Entity<ProjectMembership>()
44+
modelBuilder.Entity<ProjectMemberShip>()
4645
.HasOne(inp => inp.User)
47-
.WithMany(u => u.ProjectMemberships)
46+
.WithMany(u => u.ProjectMemberShips)
4847
.HasForeignKey(inp => inp.UserId)
4948
.OnDelete(DeleteBehavior.Cascade);
5049

51-
modelBuilder.Entity<ProjectMembership>()
50+
modelBuilder.Entity<ProjectMemberShip>()
5251
.HasOne(inp => inp.AddedBy)
5352
.WithMany()
5453
.HasForeignKey(inp => inp.AddedByUserId)

‎api/Models/User.cs‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -202,18 +202,13 @@ public class User: IdentityUser<Guid >
202202
public ICollection<TaskItem> Issues { get; set; } = new List<TaskItem>();
203203

204204

205-
public ICollection<WorkspaceMembership> CreatedWorkspaceMemberships { get; set; } = new List<WorkspaceMembership>();
206-
public ICollection<WorkspaceMembership> WorkspaceMemberships { get; set; } = new List<WorkspaceMembership>();
205+
public ICollection<WorkspaceMemberShip> CreatedWorkspaceMemberships { get; set; } = new List<WorkspaceMemberShip>();
206+
public ICollection<WorkspaceMemberShip> WorkspaceMemberships { get; set; } = new List<WorkspaceMemberShip>();
207207

208208

209209
public ICollection<UserResource> UserResources { get; set; } = new List<UserResource>();
210210

211-
public ICollection<ProjectMembership> CreatedProjectMemberships { get; set; } = new List<ProjectMembership>();
212-
213-
[Required]
214-
public ICollection<WorkspaceRole> UserWorkspaceRoles { get; set; } = new List<WorkspaceRole>();
215-
216-
211+
public ICollection<ProjectMemberShip> CreatedProjectMemberships { get; set; } = new List<ProjectMemberShip>();
217212

218213
public ICollection<TaskAssignment> AssignedToTasks { get; set; } = new List<TaskAssignment>();
219214
public ICollection<TaskAssignment> CreatedAssignedTasks { get; set; } = new List<TaskAssignment>();
@@ -225,9 +220,9 @@ public class User: IdentityUser<Guid >
225220

226221

227222

228-
public ICollection<GroupMembership> CreatedGroupMemberships { get; set; } = new List<GroupMembership>();
223+
public ICollection<GroupMemberShip> CreatedGroupMemberships { get; set; } = new List<GroupMemberShip>();
229224

230-
public ICollection<GroupMembership> GroupMemberships { get; set; } = new List<GroupMembership>();
225+
public ICollection<GroupMemberShip> GroupMemberships { get; set; } = new List<GroupMemberShip>();
231226
public ICollection<CommentAttachment> CreatedCommentAttachments { get; set; } = new List<CommentAttachment>();
232227

233228

@@ -239,11 +234,11 @@ public class User: IdentityUser<Guid >
239234
public ICollection<Comment> ApprovedComments { get; set; } = new List<Comment>();
240235

241236

242-
public ICollection<ProjectMembership> ProjectMemberships { get; set; } = new List<ProjectMembership>();
237+
public ICollection<ProjectMemberShip> ProjectMemberShips { get; set; } = new List<ProjectMemberShip>();
243238

244239
public ICollection<WorkspaceRole> WorkspaceRoles { get; set; } = new List<WorkspaceRole>();
245240

246-
public ICollection<NotificationMembership> NotificationMemberships { get; set; } = new List<NotificationMembership>();
241+
public ICollection<NotificationMemberShip> NotificationMemberships { get; set; } = new List<NotificationMemberShip>();
247242

248243

249244
public ICollection<OAuthAccount> OAuthAccounts { get; set; } = new List<OAuthAccount>();

‎api/Models/UserGroup.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public class UserGroup
8484
(double)CurrentStorageBytes / MaxStorageBytes * 100 : 0;
8585

8686
public ICollection<Subscription> Subscriptions { get; set; } = new List<Subscription>();
87-
public ICollection<GroupMembership> Users { get; set; } = new List<GroupMembership>();
87+
public ICollection<GroupMemberShip> Users { get; set; } = new List<GroupMemberShip>();
8888
public ICollection<Workspace> Workspaces { get; set; } = new List<Workspace>();
8989
public ICollection<GroupInvitation> Invitations { get; set; } = new List<GroupInvitation>();
9090
}

‎api/Models/UserResource.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class UserResource
99
public int Id { get; set; }
1010

1111
[Required]
12-
public int ResourceId { get; set; }
12+
public Guid ResourceId { get; set; }
1313
[ForeignKey(nameof(ResourceId))]
1414

1515
public Resource Resource { get; set; }

‎api/Models/UserRole.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class UserRole
1717
public User User { get; set; } = null!;
1818

1919
[Required]
20-
public int? RoleId { get; set; }
20+
public Guid RoleId { get; set; }
2121
[ForeignKey(nameof(RoleId))]
2222

2323
public Role Role { get; set; }

0 commit comments

Comments
 (0)