Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Analysim.Core/Entities/Project.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ public class Project
// Logs
public ICollection<ProjectLog> ProjectLogs { get; set; } = new List<ProjectLog>();
public ICollection<Publication> Publications { get; set; } = new List<Publication>();
public ICollection<ProjectMembershipRequest> ProjectMembershipRequests { get; set; } = new List<ProjectMembershipRequest>();

public int ForkedFromProjectID { get; set; }
}
}

46 changes: 46 additions & 0 deletions src/Analysim.Core/Entities/ProjectMembershipRequest.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;

namespace Core.Entities
{
public class ProjectMembershipRequest
{
[Key]
public int ProjectMembershipRequestID { get; set; }

[Required(ErrorMessage = "Project ID is a required field.")]
[ForeignKey("Project")]
public int ProjectID { get; set; }
public Project Project { get; set; }

[Required(ErrorMessage = "Requester User ID is a required field.")]
[ForeignKey("RequesterUser")]
public int RequesterUserID { get; set; }
public User RequesterUser { get; set; }

[Required(ErrorMessage = "Target User ID is a required field.")]
[ForeignKey("TargetUser")]
public int TargetUserID { get; set; }
public User TargetUser { get; set; }

[Required(ErrorMessage = "Created By User ID is a required field.")]
[ForeignKey("CreatedByUser")]
public int CreatedByUserID { get; set; }
public User CreatedByUser { get; set; }

[Required(ErrorMessage = "Request Type is a required field.")]
public string Type { get; set; }

[Required(ErrorMessage = "Request Status is a required field.")]
public string Status { get; set; }

[MaxLength(500, ErrorMessage = "Maximum length for Message is 500 Character.")]
public string Message { get; set; }

[Required(ErrorMessage = "Created At is a required field.")]
public DateTimeOffset CreatedAt { get; set; }

public DateTimeOffset? RespondedAt { get; set; }
}
}
32 changes: 32 additions & 0 deletions src/Analysim.Infrastructure/Data/ApplicationDbContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,37 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
.WithOne(pp => pp.Project)
.HasForeignKey(pp => pp.ProjectID)
.OnDelete(DeleteBehavior.Cascade);

// One To Many Relationship (Project -> ProjectMembershipRequest)
modelBuilder.Entity<Project>()
.HasMany(p => p.ProjectMembershipRequests)
.WithOne(pmr => pmr.Project)
.HasForeignKey(pmr => pmr.ProjectID)
.OnDelete(DeleteBehavior.Cascade);

modelBuilder.Entity<ProjectMembershipRequest>()
.HasOne(pmr => pmr.RequesterUser)
.WithMany()
.HasForeignKey(pmr => pmr.RequesterUserID)
.OnDelete(DeleteBehavior.Restrict);

modelBuilder.Entity<ProjectMembershipRequest>()
.HasOne(pmr => pmr.TargetUser)
.WithMany()
.HasForeignKey(pmr => pmr.TargetUserID)
.OnDelete(DeleteBehavior.Restrict);

modelBuilder.Entity<ProjectMembershipRequest>()
.HasOne(pmr => pmr.CreatedByUser)
.WithMany()
.HasForeignKey(pmr => pmr.CreatedByUserID)
.OnDelete(DeleteBehavior.Restrict);

modelBuilder.Entity<ProjectMembershipRequest>()
.HasIndex(pmr => new { pmr.ProjectID, pmr.TargetUserID, pmr.Type, pmr.Status });

modelBuilder.Entity<ProjectMembershipRequest>()
.HasIndex(pmr => pmr.CreatedByUserID);
}


Expand All @@ -279,5 +310,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
public DbSet<ProjectLog> ProjectLogs { get; set; }

public DbSet<Publication> Publications { get; set; }
public DbSet<ProjectMembershipRequest> ProjectMembershipRequests { get; set; }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,57 @@ protected override void BuildModel(ModelBuilder modelBuilder)
b.ToTable("ProjectTags");
});

modelBuilder.Entity("Core.Entities.ProjectMembershipRequest", b =>
{
b.Property<int>("ProjectMembershipRequestID")
.ValueGeneratedOnAdd()
.HasColumnType("integer");

NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("ProjectMembershipRequestID"));

b.Property<int>("CreatedByUserID")
.HasColumnType("integer");

b.Property<DateTimeOffset>("CreatedAt")
.HasColumnType("timestamp with time zone");

b.Property<string>("Message")
.HasMaxLength(500)
.HasColumnType("character varying(500)");

b.Property<int>("ProjectID")
.HasColumnType("integer");

b.Property<DateTimeOffset?>("RespondedAt")
.HasColumnType("timestamp with time zone");

b.Property<int>("RequesterUserID")
.HasColumnType("integer");

b.Property<string>("Status")
.IsRequired()
.HasColumnType("text");

b.Property<int>("TargetUserID")
.HasColumnType("integer");

b.Property<string>("Type")
.IsRequired()
.HasColumnType("text");

b.HasKey("ProjectMembershipRequestID");

b.HasIndex("CreatedByUserID");

b.HasIndex("RequesterUserID");

b.HasIndex("TargetUserID");

b.HasIndex("ProjectID", "TargetUserID", "Type", "Status");

b.ToTable("ProjectMembershipRequests");
});

modelBuilder.Entity("Core.Entities.ProjectUser", b =>
{
b.Property<int>("UserID")
Expand Down Expand Up @@ -1019,6 +1070,41 @@ protected override void BuildModel(ModelBuilder modelBuilder)
b.Navigation("User");
});

modelBuilder.Entity("Core.Entities.ProjectMembershipRequest", b =>
{
b.HasOne("Core.Entities.User", "CreatedByUser")
.WithMany()
.HasForeignKey("CreatedByUserID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();

b.HasOne("Core.Entities.Project", "Project")
.WithMany("ProjectMembershipRequests")
.HasForeignKey("ProjectID")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();

b.HasOne("Core.Entities.User", "RequesterUser")
.WithMany()
.HasForeignKey("RequesterUserID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();

b.HasOne("Core.Entities.User", "TargetUser")
.WithMany()
.HasForeignKey("TargetUserID")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();

b.Navigation("CreatedByUser");

b.Navigation("Project");

b.Navigation("RequesterUser");

b.Navigation("TargetUser");
});

modelBuilder.Entity("Core.Entities.Publication", b =>
{
b.HasOne("Core.Entities.Project", "Project")
Expand Down Expand Up @@ -1133,6 +1219,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)

b.Navigation("ProjectLogs");

b.Navigation("ProjectMembershipRequests");

b.Navigation("ProjectTags");

b.Navigation("ProjectUsers");
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
using System;
using Infrastructure.Data;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;

#nullable disable

namespace Infrastructure.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20260830040500_AddProjectMembershipRequests")]
public partial class AddProjectMembershipRequests : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "ProjectMembershipRequests",
columns: table => new
{
ProjectMembershipRequestID = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
ProjectID = table.Column<int>(type: "integer", nullable: false),
RequesterUserID = table.Column<int>(type: "integer", nullable: false),
TargetUserID = table.Column<int>(type: "integer", nullable: false),
CreatedByUserID = table.Column<int>(type: "integer", nullable: false),
Type = table.Column<string>(type: "text", nullable: false),
Status = table.Column<string>(type: "text", nullable: false),
Message = table.Column<string>(type: "character varying(500)", maxLength: 500, nullable: true),
CreatedAt = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
RespondedAt = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_ProjectMembershipRequests", x => x.ProjectMembershipRequestID);
table.ForeignKey(
name: "FK_ProjectMembershipRequests_AspNetUsers_CreatedByUserID",
column: x => x.CreatedByUserID,
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_ProjectMembershipRequests_AspNetUsers_RequesterUserID",
column: x => x.RequesterUserID,
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_ProjectMembershipRequests_AspNetUsers_TargetUserID",
column: x => x.TargetUserID,
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
table.ForeignKey(
name: "FK_ProjectMembershipRequests_Projects_ProjectID",
column: x => x.ProjectID,
principalTable: "Projects",
principalColumn: "ProjectID",
onDelete: ReferentialAction.Cascade);
});

migrationBuilder.CreateIndex(
name: "IX_ProjectMembershipRequests_CreatedByUserID",
table: "ProjectMembershipRequests",
column: "CreatedByUserID");

migrationBuilder.CreateIndex(
name: "IX_ProjectMembershipRequests_ProjectID_TargetUserID_Type_Status",
table: "ProjectMembershipRequests",
columns: new[] { "ProjectID", "TargetUserID", "Type", "Status" });

migrationBuilder.CreateIndex(
name: "IX_ProjectMembershipRequests_RequesterUserID",
table: "ProjectMembershipRequests",
column: "RequesterUserID");

migrationBuilder.CreateIndex(
name: "IX_ProjectMembershipRequests_TargetUserID",
table: "ProjectMembershipRequests",
column: "TargetUserID");
}

protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "ProjectMembershipRequests");
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { Project } from './project';
import { User } from './user';

export interface ProjectMembershipRequest {
projectMembershipRequestID: number
projectID: number
project: Project
requesterUserID: number
requesterUser: User
targetUserID: number
targetUser: User
createdByUserID: number
createdByUser: User
type: string
status: string
message: string
createdAt: Date
respondedAt: Date
}
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,15 @@ <h5 class="card-title text-center mb-1">{{ profile.userName }}</h5>
</span>
</a>
</li>
<!-- Invites Tab -->
<li class="nav-item" *ngIf="isOwnProfile">
<a class="nav-link d-flex align-items-center" [class.active]="tabActive[3]" (click)="changeTab(3)">
Invites
<span class="badge badge-primary font-weight-light ml-1">
{{pendingInvitations.length}}
</span>
</a>
</li>
</ul>

<!-- Nav Content -->
Expand All @@ -97,6 +106,45 @@ <h5 class="card-title text-center mb-1">{{ profile.userName }}</h5>
<app-profile-card [profile]=follower></app-profile-card>
</li>
</ul>
<!-- Invites List -->
<ul class="list-group list-group-flush" *ngIf="tabActive[3] && isOwnProfile">
<li class="list-group-item border-0 p-0" *ngFor="let invitation of pendingInvitations; let lastItem = last"
[class.mb-3]="!lastItem">
<div class="profile-invite-row">
<div class="profile-invite-main">
<div
class="profile-invite-title"
*ngIf="invitation.project">
<a [routerLink]='["/project/" + (invitation.project.route | route:"owner") + "/" + (invitation.project.route | route:"projectname")]'>
{{invitation.project.route | route:"owner"}}/{{invitation.project.route | route:"projectname"}}
</a>
</div>
<small class="text-muted">
Invited by {{invitation.createdByUser?.userName}} - {{invitation.createdAt | date:'medium'}}
</small>
</div>
<div class="profile-invite-actions">
<button
type="button"
class="btn btn-sm"
(click)="acceptInvitation(invitation)"
[disabled]="requestActionID == invitation.projectMembershipRequestID">
Accept
</button>
<button
type="button"
class="btn btn-sm btn-outline-danger"
(click)="rejectInvitation(invitation)"
[disabled]="requestActionID == invitation.projectMembershipRequestID">
Reject
</button>
</div>
</div>
</li>
<li class="list-group-item border-0 text-muted" *ngIf="pendingInvitations.length == 0">
No pending invitations.
</li>
</ul>
</div>
</div>
</div>
Expand All @@ -106,4 +154,4 @@ <h5 class="card-title text-center mb-1">{{ profile.userName }}</h5>
</div> <!-- Row End -->
</div> <!-- Container End -->

<app-not-found *ngIf="showError"></app-not-found>
<app-not-found *ngIf="showError"></app-not-found>
Loading
Loading