From 213faadf55861a046e10cd3ddfa66e205bfdf6e1 Mon Sep 17 00:00:00 2001 From: "soroush.asadi" Date: Thu, 4 Jun 2026 18:17:56 +0330 Subject: [PATCH] [Alerts] Customizable job alerts + Help capabilities showcase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Job alerts (هشدار شغلی): users save what they want — scope (shift/job/both), role, city, shift type, employment type, minimum pay — and get notified when an employer posts a match. New JobAlert model + AlertScope enum + DbContext (user-cascade, role set-null, IsActive index) + migration. /Me/Alerts page to create/pause/delete alerts; entry point added to the کارجو panel. NotificationService.NotifyNewShift/Job now unions preference matches with active-alert matches (deduped) so alert owners are notified on publish. Help page gains an 'امکانات همکادر' capability showcase grid (with a 'ساخت هشدار شغلی' CTA) so the page demonstrates what the app does. Co-Authored-By: Claude Opus 4.8 --- src/JobsMedical.Web/Data/AppDbContext.cs | 10 + .../20260604144346_JobAlerts.Designer.cs | 1212 +++++++++++++++++ .../Migrations/20260604144346_JobAlerts.cs | 83 ++ .../Migrations/AppDbContextModelSnapshot.cs | 79 ++ src/JobsMedical.Web/Models/Enums.cs | 8 + src/JobsMedical.Web/Models/JobAlert.cs | 37 + src/JobsMedical.Web/Pages/Help.cshtml | 45 + src/JobsMedical.Web/Pages/Me/Alerts.cshtml | 134 ++ src/JobsMedical.Web/Pages/Me/Alerts.cshtml.cs | 79 ++ src/JobsMedical.Web/Pages/Me/Index.cshtml | 5 +- .../Services/NotificationService.cs | 38 +- 11 files changed, 1727 insertions(+), 3 deletions(-) create mode 100644 src/JobsMedical.Web/Migrations/20260604144346_JobAlerts.Designer.cs create mode 100644 src/JobsMedical.Web/Migrations/20260604144346_JobAlerts.cs create mode 100644 src/JobsMedical.Web/Models/JobAlert.cs create mode 100644 src/JobsMedical.Web/Pages/Me/Alerts.cshtml create mode 100644 src/JobsMedical.Web/Pages/Me/Alerts.cshtml.cs diff --git a/src/JobsMedical.Web/Data/AppDbContext.cs b/src/JobsMedical.Web/Data/AppDbContext.cs index bf83538..8a095ba 100644 --- a/src/JobsMedical.Web/Data/AppDbContext.cs +++ b/src/JobsMedical.Web/Data/AppDbContext.cs @@ -25,6 +25,7 @@ public class AppDbContext : DbContext public DbSet Notifications => Set(); public DbSet Reports => Set(); public DbSet FacilityDocuments => Set(); + public DbSet JobAlerts => Set(); protected override void OnModelCreating(ModelBuilder b) { @@ -83,6 +84,15 @@ public class AppDbContext : DbContext .HasOne(d => d.Facility).WithMany(f => f.Documents) .HasForeignKey(d => d.FacilityId).OnDelete(DeleteBehavior.Cascade); + // Job alerts belong to a user; remove with the user. Don't cascade from Role. + b.Entity() + .HasOne(a => a.User).WithMany() + .HasForeignKey(a => a.UserId).OnDelete(DeleteBehavior.Cascade); + b.Entity() + .HasOne(a => a.Role).WithMany() + .HasForeignKey(a => a.RoleId).OnDelete(DeleteBehavior.SetNull); + b.Entity().HasIndex(a => a.IsActive); + // Don't delete shifts/profiles just because a Role is removed. b.Entity() .HasOne(s => s.Role).WithMany(r => r.Shifts) diff --git a/src/JobsMedical.Web/Migrations/20260604144346_JobAlerts.Designer.cs b/src/JobsMedical.Web/Migrations/20260604144346_JobAlerts.Designer.cs new file mode 100644 index 0000000..c6acb95 --- /dev/null +++ b/src/JobsMedical.Web/Migrations/20260604144346_JobAlerts.Designer.cs @@ -0,0 +1,1212 @@ +// +using System; +using JobsMedical.Web.Data; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +#nullable disable + +namespace JobsMedical.Web.Migrations +{ + [DbContext(typeof(AppDbContext))] + [Migration("20260604144346_JobAlerts")] + partial class JobAlerts + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "10.0.0") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("JobsMedical.Web.Models.AppSetting", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("AiApiKey") + .HasMaxLength(200) + .HasColumnType("character varying(200)"); + + b.Property("AiAutoApprove") + .HasColumnType("boolean"); + + b.Property("AiEnabled") + .HasColumnType("boolean"); + + b.Property("AiEndpoint") + .HasMaxLength(500) + .HasColumnType("character varying(500)"); + + b.Property("AiModel") + .HasMaxLength(120) + .HasColumnType("character varying(120)"); + + b.Property("AiSystemPrompt") + .IsRequired() + .HasMaxLength(4000) + .HasColumnType("character varying(4000)"); + + b.Property("AutoIngestEnabled") + .HasColumnType("boolean"); + + b.Property("AutoPublishMinConfidence") + .HasColumnType("integer"); + + b.Property("BaleBotToken") + .HasMaxLength(200) + .HasColumnType("character varying(200)"); + + b.Property("BaleEnabled") + .HasColumnType("boolean"); + + b.Property("DemoMode") + .HasColumnType("boolean"); + + b.Property("DivarCity") + .HasMaxLength(60) + .HasColumnType("character varying(60)"); + + b.Property("DivarEnabled") + .HasColumnType("boolean"); + + b.Property("DivarQueries") + .HasMaxLength(2000) + .HasColumnType("character varying(2000)"); + + b.Property("IngestIntervalMinutes") + .HasColumnType("integer"); + + b.Property("IngestProxyEnabled") + .HasColumnType("boolean"); + + b.Property("IngestProxyUrl") + .HasMaxLength(200) + .HasColumnType("character varying(200)"); + + b.Property("MedjobsEnabled") + .HasColumnType("boolean"); + + b.Property("MedjobsMaxAds") + .HasColumnType("integer"); + + b.Property("Mode") + .HasColumnType("integer"); + + b.Property("NeshanMapKey") + .HasMaxLength(200) + .HasColumnType("character varying(200)"); + + b.Property("PushEnabled") + .HasColumnType("boolean"); + + b.Property("SmsApiKey") + .HasMaxLength(200) + .HasColumnType("character varying(200)"); + + b.Property("SmsEnabled") + .HasColumnType("boolean"); + + b.Property("SmsSender") + .HasMaxLength(30) + .HasColumnType("character varying(30)"); + + b.Property("SmsTemplate") + .HasMaxLength(100) + .HasColumnType("character varying(100)"); + + b.Property("TelegramChannels") + .HasMaxLength(2000) + .HasColumnType("character varying(2000)"); + + b.Property("TelegramEnabled") + .HasColumnType("boolean"); + + b.Property("UpdatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("VapidPrivateKey") + .HasMaxLength(200) + .HasColumnType("character varying(200)"); + + b.Property("VapidPublicKey") + .HasMaxLength(200) + .HasColumnType("character varying(200)"); + + b.Property("VapidSubject") + .HasMaxLength(120) + .HasColumnType("character varying(120)"); + + b.Property("WebNotificationsEnabled") + .HasColumnType("boolean"); + + b.Property("WebsiteUrls") + .HasMaxLength(4000) + .HasColumnType("character varying(4000)"); + + b.Property("WebsitesEnabled") + .HasColumnType("boolean"); + + b.HasKey("Id"); + + b.ToTable("AppSettings"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.Application", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("DoctorId") + .HasColumnType("integer"); + + b.Property("Message") + .HasMaxLength(500) + .HasColumnType("character varying(500)"); + + b.Property("ShiftId") + .HasColumnType("integer"); + + b.Property("Status") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("DoctorId"); + + b.HasIndex("ShiftId", "DoctorId") + .IsUnique(); + + b.ToTable("Applications"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.City", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("IsActive") + .HasColumnType("boolean"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("character varying(100)"); + + b.Property("Province") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("character varying(100)"); + + b.HasKey("Id"); + + b.ToTable("Cities"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.District", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("CityId") + .HasColumnType("integer"); + + b.Property("IsActive") + .HasColumnType("boolean"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(120) + .HasColumnType("character varying(120)"); + + b.HasKey("Id"); + + b.HasIndex("CityId"); + + b.ToTable("Districts"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.DoctorProfile", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Bio") + .HasMaxLength(1000) + .HasColumnType("character varying(1000)"); + + b.Property("CityId") + .HasColumnType("integer"); + + b.Property("IsVerified") + .HasColumnType("boolean"); + + b.Property("LicenseNo") + .HasMaxLength(20) + .HasColumnType("character varying(20)"); + + b.Property("RoleId") + .HasColumnType("integer"); + + b.Property("Specialty") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("character varying(100)"); + + b.Property("UserId") + .HasColumnType("integer"); + + b.Property("YearsExperience") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("CityId"); + + b.HasIndex("RoleId"); + + b.HasIndex("UserId") + .IsUnique(); + + b.ToTable("DoctorProfiles"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.Facility", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Address") + .HasMaxLength(500) + .HasColumnType("character varying(500)"); + + b.Property("BaleId") + .HasMaxLength(50) + .HasColumnType("character varying(50)"); + + b.Property("CityId") + .HasColumnType("integer"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("DistrictId") + .HasColumnType("integer"); + + b.Property("IsDemo") + .HasColumnType("boolean"); + + b.Property("IsVerified") + .HasColumnType("boolean"); + + b.Property("Lat") + .HasColumnType("double precision"); + + b.Property("Lng") + .HasColumnType("double precision"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("character varying(200)"); + + b.Property("OwnerUserId") + .HasColumnType("integer"); + + b.Property("Phone") + .HasMaxLength(20) + .HasColumnType("character varying(20)"); + + b.Property("Type") + .HasColumnType("integer"); + + b.Property("Verification") + .HasColumnType("integer"); + + b.Property("VerificationNote") + .HasMaxLength(500) + .HasColumnType("character varying(500)"); + + b.Property("VerificationRequestedAt") + .HasColumnType("timestamp with time zone"); + + b.HasKey("Id"); + + b.HasIndex("CityId"); + + b.HasIndex("DistrictId"); + + b.HasIndex("OwnerUserId"); + + b.ToTable("Facilities"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.FacilityDocument", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("ContentType") + .IsRequired() + .HasMaxLength(120) + .HasColumnType("character varying(120)"); + + b.Property("Data") + .IsRequired() + .HasColumnType("bytea"); + + b.Property("FacilityId") + .HasColumnType("integer"); + + b.Property("FileName") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("character varying(200)"); + + b.Property("Size") + .HasColumnType("bigint"); + + b.Property("UploadedAt") + .HasColumnType("timestamp with time zone"); + + b.HasKey("Id"); + + b.HasIndex("FacilityId"); + + b.ToTable("FacilityDocuments"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.InterestEvent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("EventType") + .HasColumnType("integer"); + + b.Property("JobOpeningId") + .HasColumnType("integer"); + + b.Property("ShiftId") + .HasColumnType("integer"); + + b.Property("VisitorId") + .IsRequired() + .HasColumnType("character varying(36)"); + + b.HasKey("Id"); + + b.HasIndex("JobOpeningId"); + + b.HasIndex("ShiftId"); + + b.HasIndex("VisitorId", "CreatedAt"); + + b.ToTable("InterestEvents"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.JobAlert", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("CityId") + .HasColumnType("integer"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("DistrictId") + .HasColumnType("integer"); + + b.Property("EmploymentType") + .HasColumnType("integer"); + + b.Property("IsActive") + .HasColumnType("boolean"); + + b.Property("Label") + .HasMaxLength(120) + .HasColumnType("character varying(120)"); + + b.Property("MinPay") + .HasColumnType("bigint"); + + b.Property("RoleId") + .HasColumnType("integer"); + + b.Property("Scope") + .HasColumnType("integer"); + + b.Property("ShiftType") + .HasColumnType("integer"); + + b.Property("UserId") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("CityId"); + + b.HasIndex("IsActive"); + + b.HasIndex("RoleId"); + + b.HasIndex("UserId"); + + b.ToTable("JobAlerts"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.JobOpening", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("Description") + .HasMaxLength(2000) + .HasColumnType("character varying(2000)"); + + b.Property("EmploymentType") + .HasColumnType("integer"); + + b.Property("FacilityId") + .HasColumnType("integer"); + + b.Property("GenderRequirement") + .HasColumnType("integer"); + + b.Property("Requirements") + .HasMaxLength(1000) + .HasColumnType("character varying(1000)"); + + b.Property("RoleId") + .HasColumnType("integer"); + + b.Property("SalaryMax") + .HasColumnType("bigint"); + + b.Property("SalaryMin") + .HasColumnType("bigint"); + + b.Property("Source") + .HasColumnType("integer"); + + b.Property("SourceUrl") + .HasMaxLength(500) + .HasColumnType("character varying(500)"); + + b.Property("Status") + .HasColumnType("integer"); + + b.Property("Title") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("character varying(200)"); + + b.HasKey("Id"); + + b.HasIndex("FacilityId"); + + b.HasIndex("RoleId"); + + b.HasIndex("Status"); + + b.ToTable("JobOpenings"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.Notification", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("bigint"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Body") + .HasMaxLength(500) + .HasColumnType("character varying(500)"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("IsRead") + .HasColumnType("boolean"); + + b.Property("Title") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("character varying(200)"); + + b.Property("Url") + .HasMaxLength(300) + .HasColumnType("character varying(300)"); + + b.Property("UserId") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("UserId", "IsRead", "CreatedAt"); + + b.ToTable("Notifications"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.RawListing", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Confidence") + .HasColumnType("integer"); + + b.Property("ContentHash") + .HasMaxLength(64) + .HasColumnType("character varying(64)"); + + b.Property("FetchedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("LinkedShiftId") + .HasColumnType("integer"); + + b.Property("ParsedJson") + .HasColumnType("text"); + + b.Property("RawText") + .IsRequired() + .HasColumnType("text"); + + b.Property("SourceChannel") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("character varying(200)"); + + b.Property("SourceUrl") + .HasMaxLength(500) + .HasColumnType("character varying(500)"); + + b.Property("Status") + .HasColumnType("integer"); + + b.Property("ValidationNotes") + .HasMaxLength(1000) + .HasColumnType("character varying(1000)"); + + b.HasKey("Id"); + + b.HasIndex("ContentHash"); + + b.HasIndex("LinkedShiftId"); + + b.HasIndex("Status"); + + b.ToTable("RawListings"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.Report", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("Reason") + .IsRequired() + .HasMaxLength(500) + .HasColumnType("character varying(500)"); + + b.Property("ReporterUserId") + .HasColumnType("integer"); + + b.Property("ReporterVisitorId") + .HasMaxLength(36) + .HasColumnType("character varying(36)"); + + b.Property("Status") + .HasColumnType("integer"); + + b.Property("TargetId") + .HasColumnType("integer"); + + b.Property("TargetLabel") + .HasMaxLength(160) + .HasColumnType("character varying(160)"); + + b.Property("TargetType") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("Status"); + + b.ToTable("Reports"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.Role", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Category") + .IsRequired() + .HasMaxLength(50) + .HasColumnType("character varying(50)"); + + b.Property("IsActive") + .HasColumnType("boolean"); + + b.Property("Name") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("character varying(100)"); + + b.Property("SortOrder") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.ToTable("Roles"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.Shift", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("Date") + .HasColumnType("date"); + + b.Property("Description") + .HasMaxLength(1500) + .HasColumnType("character varying(1500)"); + + b.Property("EndTime") + .HasColumnType("time without time zone"); + + b.Property("FacilityId") + .HasColumnType("integer"); + + b.Property("GenderRequirement") + .HasColumnType("integer"); + + b.Property("PayAmount") + .HasColumnType("bigint"); + + b.Property("PayType") + .HasColumnType("integer"); + + b.Property("RoleId") + .HasColumnType("integer"); + + b.Property("SharePercent") + .HasColumnType("integer"); + + b.Property("ShiftType") + .HasColumnType("integer"); + + b.Property("Source") + .HasColumnType("integer"); + + b.Property("SourceUrl") + .HasMaxLength(500) + .HasColumnType("character varying(500)"); + + b.Property("SpecialtyRequired") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("character varying(100)"); + + b.Property("StartTime") + .HasColumnType("time without time zone"); + + b.Property("Status") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("FacilityId"); + + b.HasIndex("RoleId"); + + b.HasIndex("Date", "Status"); + + b.ToTable("Shifts"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.User", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("BanReason") + .HasMaxLength(300) + .HasColumnType("character varying(300)"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("FullName") + .HasMaxLength(150) + .HasColumnType("character varying(150)"); + + b.Property("IsBanned") + .HasColumnType("boolean"); + + b.Property("IsPhoneVerified") + .HasColumnType("boolean"); + + b.Property("Phone") + .IsRequired() + .HasMaxLength(20) + .HasColumnType("character varying(20)"); + + b.Property("Role") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("Phone") + .IsUnique(); + + b.ToTable("Users"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.UserPreferences", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("CityId") + .HasColumnType("integer"); + + b.Property("Gender") + .HasColumnType("integer"); + + b.Property("MinPay") + .HasColumnType("bigint"); + + b.Property("PreferredShiftType") + .HasColumnType("integer"); + + b.Property("RoleId") + .HasColumnType("integer"); + + b.Property("UpdatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("VisitorId") + .IsRequired() + .HasColumnType("character varying(36)"); + + b.HasKey("Id"); + + b.HasIndex("CityId"); + + b.HasIndex("RoleId"); + + b.HasIndex("VisitorId") + .IsUnique(); + + b.ToTable("UserPreferences"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.Visitor", b => + { + b.Property("Id") + .HasMaxLength(36) + .HasColumnType("character varying(36)"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("LastSeenAt") + .HasColumnType("timestamp with time zone"); + + b.Property("UserId") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("UserId"); + + b.ToTable("Visitors"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.WebPushSubscription", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Auth") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("character varying(100)"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("Endpoint") + .IsRequired() + .HasMaxLength(600) + .HasColumnType("character varying(600)"); + + b.Property("P256dh") + .IsRequired() + .HasMaxLength(200) + .HasColumnType("character varying(200)"); + + b.Property("VisitorId") + .HasMaxLength(36) + .HasColumnType("character varying(36)"); + + b.HasKey("Id"); + + b.HasIndex("Endpoint") + .IsUnique(); + + b.ToTable("WebPushSubscriptions"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.Application", b => + { + b.HasOne("JobsMedical.Web.Models.User", "Doctor") + .WithMany("Applications") + .HasForeignKey("DoctorId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("JobsMedical.Web.Models.Shift", "Shift") + .WithMany("Applications") + .HasForeignKey("ShiftId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Doctor"); + + b.Navigation("Shift"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.District", b => + { + b.HasOne("JobsMedical.Web.Models.City", "City") + .WithMany() + .HasForeignKey("CityId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("City"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.DoctorProfile", b => + { + b.HasOne("JobsMedical.Web.Models.City", "City") + .WithMany() + .HasForeignKey("CityId"); + + b.HasOne("JobsMedical.Web.Models.Role", "Role") + .WithMany() + .HasForeignKey("RoleId"); + + b.HasOne("JobsMedical.Web.Models.User", "User") + .WithOne("DoctorProfile") + .HasForeignKey("JobsMedical.Web.Models.DoctorProfile", "UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("City"); + + b.Navigation("Role"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.Facility", b => + { + b.HasOne("JobsMedical.Web.Models.City", "City") + .WithMany("Facilities") + .HasForeignKey("CityId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("JobsMedical.Web.Models.District", "District") + .WithMany("Facilities") + .HasForeignKey("DistrictId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("JobsMedical.Web.Models.User", "OwnerUser") + .WithMany() + .HasForeignKey("OwnerUserId") + .OnDelete(DeleteBehavior.SetNull); + + b.Navigation("City"); + + b.Navigation("District"); + + b.Navigation("OwnerUser"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.FacilityDocument", b => + { + b.HasOne("JobsMedical.Web.Models.Facility", "Facility") + .WithMany("Documents") + .HasForeignKey("FacilityId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Facility"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.InterestEvent", b => + { + b.HasOne("JobsMedical.Web.Models.JobOpening", "JobOpening") + .WithMany() + .HasForeignKey("JobOpeningId") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("JobsMedical.Web.Models.Shift", "Shift") + .WithMany() + .HasForeignKey("ShiftId") + .OnDelete(DeleteBehavior.Cascade); + + b.HasOne("JobsMedical.Web.Models.Visitor", "Visitor") + .WithMany("Events") + .HasForeignKey("VisitorId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("JobOpening"); + + b.Navigation("Shift"); + + b.Navigation("Visitor"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.JobAlert", b => + { + b.HasOne("JobsMedical.Web.Models.City", "City") + .WithMany() + .HasForeignKey("CityId"); + + b.HasOne("JobsMedical.Web.Models.Role", "Role") + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("JobsMedical.Web.Models.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("City"); + + b.Navigation("Role"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.JobOpening", b => + { + b.HasOne("JobsMedical.Web.Models.Facility", "Facility") + .WithMany() + .HasForeignKey("FacilityId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("JobsMedical.Web.Models.Role", "Role") + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("Facility"); + + b.Navigation("Role"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.Notification", b => + { + b.HasOne("JobsMedical.Web.Models.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("User"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.RawListing", b => + { + b.HasOne("JobsMedical.Web.Models.Shift", "LinkedShift") + .WithMany() + .HasForeignKey("LinkedShiftId"); + + b.Navigation("LinkedShift"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.Shift", b => + { + b.HasOne("JobsMedical.Web.Models.Facility", "Facility") + .WithMany("Shifts") + .HasForeignKey("FacilityId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("JobsMedical.Web.Models.Role", "Role") + .WithMany("Shifts") + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.Restrict) + .IsRequired(); + + b.Navigation("Facility"); + + b.Navigation("Role"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.UserPreferences", b => + { + b.HasOne("JobsMedical.Web.Models.City", "City") + .WithMany() + .HasForeignKey("CityId"); + + b.HasOne("JobsMedical.Web.Models.Role", "Role") + .WithMany() + .HasForeignKey("RoleId"); + + b.HasOne("JobsMedical.Web.Models.Visitor", "Visitor") + .WithOne("Preferences") + .HasForeignKey("JobsMedical.Web.Models.UserPreferences", "VisitorId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("City"); + + b.Navigation("Role"); + + b.Navigation("Visitor"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.Visitor", b => + { + b.HasOne("JobsMedical.Web.Models.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.SetNull); + + b.Navigation("User"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.City", b => + { + b.Navigation("Facilities"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.District", b => + { + b.Navigation("Facilities"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.Facility", b => + { + b.Navigation("Documents"); + + b.Navigation("Shifts"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.Role", b => + { + b.Navigation("Shifts"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.Shift", b => + { + b.Navigation("Applications"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.User", b => + { + b.Navigation("Applications"); + + b.Navigation("DoctorProfile"); + }); + + modelBuilder.Entity("JobsMedical.Web.Models.Visitor", b => + { + b.Navigation("Events"); + + b.Navigation("Preferences"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/src/JobsMedical.Web/Migrations/20260604144346_JobAlerts.cs b/src/JobsMedical.Web/Migrations/20260604144346_JobAlerts.cs new file mode 100644 index 0000000..b8d8398 --- /dev/null +++ b/src/JobsMedical.Web/Migrations/20260604144346_JobAlerts.cs @@ -0,0 +1,83 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; + +#nullable disable + +namespace JobsMedical.Web.Migrations +{ + /// + public partial class JobAlerts : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "JobAlerts", + columns: table => new + { + Id = table.Column(type: "integer", nullable: false) + .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), + UserId = table.Column(type: "integer", nullable: false), + Label = table.Column(type: "character varying(120)", maxLength: 120, nullable: true), + Scope = table.Column(type: "integer", nullable: false), + RoleId = table.Column(type: "integer", nullable: true), + CityId = table.Column(type: "integer", nullable: true), + DistrictId = table.Column(type: "integer", nullable: true), + ShiftType = table.Column(type: "integer", nullable: true), + EmploymentType = table.Column(type: "integer", nullable: true), + MinPay = table.Column(type: "bigint", nullable: true), + IsActive = table.Column(type: "boolean", nullable: false), + CreatedAt = table.Column(type: "timestamp with time zone", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_JobAlerts", x => x.Id); + table.ForeignKey( + name: "FK_JobAlerts_Cities_CityId", + column: x => x.CityId, + principalTable: "Cities", + principalColumn: "Id"); + table.ForeignKey( + name: "FK_JobAlerts_Roles_RoleId", + column: x => x.RoleId, + principalTable: "Roles", + principalColumn: "Id", + onDelete: ReferentialAction.SetNull); + table.ForeignKey( + name: "FK_JobAlerts_Users_UserId", + column: x => x.UserId, + principalTable: "Users", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_JobAlerts_CityId", + table: "JobAlerts", + column: "CityId"); + + migrationBuilder.CreateIndex( + name: "IX_JobAlerts_IsActive", + table: "JobAlerts", + column: "IsActive"); + + migrationBuilder.CreateIndex( + name: "IX_JobAlerts_RoleId", + table: "JobAlerts", + column: "RoleId"); + + migrationBuilder.CreateIndex( + name: "IX_JobAlerts_UserId", + table: "JobAlerts", + column: "UserId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "JobAlerts"); + } + } +} diff --git a/src/JobsMedical.Web/Migrations/AppDbContextModelSnapshot.cs b/src/JobsMedical.Web/Migrations/AppDbContextModelSnapshot.cs index 7deb678..4e6eba6 100644 --- a/src/JobsMedical.Web/Migrations/AppDbContextModelSnapshot.cs +++ b/src/JobsMedical.Web/Migrations/AppDbContextModelSnapshot.cs @@ -438,6 +438,61 @@ namespace JobsMedical.Web.Migrations b.ToTable("InterestEvents"); }); + modelBuilder.Entity("JobsMedical.Web.Models.JobAlert", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("CityId") + .HasColumnType("integer"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("DistrictId") + .HasColumnType("integer"); + + b.Property("EmploymentType") + .HasColumnType("integer"); + + b.Property("IsActive") + .HasColumnType("boolean"); + + b.Property("Label") + .HasMaxLength(120) + .HasColumnType("character varying(120)"); + + b.Property("MinPay") + .HasColumnType("bigint"); + + b.Property("RoleId") + .HasColumnType("integer"); + + b.Property("Scope") + .HasColumnType("integer"); + + b.Property("ShiftType") + .HasColumnType("integer"); + + b.Property("UserId") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("CityId"); + + b.HasIndex("IsActive"); + + b.HasIndex("RoleId"); + + b.HasIndex("UserId"); + + b.ToTable("JobAlerts"); + }); + modelBuilder.Entity("JobsMedical.Web.Models.JobOpening", b => { b.Property("Id") @@ -993,6 +1048,30 @@ namespace JobsMedical.Web.Migrations b.Navigation("Visitor"); }); + modelBuilder.Entity("JobsMedical.Web.Models.JobAlert", b => + { + b.HasOne("JobsMedical.Web.Models.City", "City") + .WithMany() + .HasForeignKey("CityId"); + + b.HasOne("JobsMedical.Web.Models.Role", "Role") + .WithMany() + .HasForeignKey("RoleId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("JobsMedical.Web.Models.User", "User") + .WithMany() + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("City"); + + b.Navigation("Role"); + + b.Navigation("User"); + }); + modelBuilder.Entity("JobsMedical.Web.Models.JobOpening", b => { b.HasOne("JobsMedical.Web.Models.Facility", "Facility") diff --git a/src/JobsMedical.Web/Models/Enums.cs b/src/JobsMedical.Web/Models/Enums.cs index e8bd67d..be951ed 100644 --- a/src/JobsMedical.Web/Models/Enums.cs +++ b/src/JobsMedical.Web/Models/Enums.cs @@ -76,6 +76,14 @@ public enum ListingKind Job = 1 } +/// Which listing types a job alert watches. +public enum AlertScope +{ + Any = 0, // هر دو (شیفت و استخدام) + Shifts = 1, // فقط شیفت + Jobs = 2 // فقط استخدام +} + /// /// Gender. On a listing it's the requirement (Any = فرقی نمی‌کند); on a person it's their gender /// (Any = unspecified). diff --git a/src/JobsMedical.Web/Models/JobAlert.cs b/src/JobsMedical.Web/Models/JobAlert.cs new file mode 100644 index 0000000..e3eab94 --- /dev/null +++ b/src/JobsMedical.Web/Models/JobAlert.cs @@ -0,0 +1,37 @@ +using System.ComponentModel.DataAnnotations; + +namespace JobsMedical.Web.Models; + +/// +/// A saved job alert ("هشدار شغلی") — the user describes what they're after (kind, role, city, +/// shift type, employment type, minimum pay). When an employer publishes a matching shift/job, +/// the matching engine notifies the owner. A user can keep several alerts; each can be paused. +/// +public class JobAlert +{ + public int Id { get; set; } + + public int UserId { get; set; } + public User User { get; set; } = null!; + + [MaxLength(120)] public string? Label { get; set; } // optional friendly name + + public AlertScope Scope { get; set; } = AlertScope.Any; + + public int? RoleId { get; set; } // null = any role + public Role? Role { get; set; } + + public int? CityId { get; set; } // null = any city + public City? City { get; set; } + + public int? DistrictId { get; set; } // null = any district + + public ShiftType? ShiftType { get; set; } // for shifts; null = any + public EmploymentType? EmploymentType { get; set; } // for jobs; null = any + + /// Minimum acceptable pay (تومان): per-shift amount for shifts, monthly salary for jobs. + public long? MinPay { get; set; } + + public bool IsActive { get; set; } = true; + public DateTime CreatedAt { get; set; } = DateTime.UtcNow; +} diff --git a/src/JobsMedical.Web/Pages/Help.cshtml b/src/JobsMedical.Web/Pages/Help.cshtml index 3594fc5..4db8b4a 100644 --- a/src/JobsMedical.Web/Pages/Help.cshtml +++ b/src/JobsMedical.Web/Pages/Help.cshtml @@ -23,6 +23,51 @@ +

امکانات همکادر

+
+
+
🗓️
+ شیفت و استخدام +

فرصت‌های شیفت کاری و موقعیت‌های استخدامی کادر درمان، یک‌جا.

+
+
+
🎯
+ پیشنهاد هوشمند +

بر اساس نقش، شهر و علاقه‌مندی‌ات، بهترین فرصت‌ها را می‌بینی.

+
+
+
📍
+ نزدیک من +

فرصت‌ها را بر اساس فاصله از موقعیت فعلی‌ات مرتب کن.

+
+
+
🔎
+ هشدار شغلی +

بگو دنبال چه فرصتی هستی؛ تا آگهی متناسب ثبت شد، فوری باخبر شو.

+ ساخت هشدار شغلی +
+
+
🔔
+ اعلان زنده +

اعلان درون‌برنامه‌ای که در ایران بدون سرویس‌های خارجی کار می‌کند.

+
+
+
✓
+ مراکز تأییدشده +

نشان «تأیید شده» روی مراکزی که مدارکشان بررسی شده است.

+
+
+
📲
+ نصب به‌صورت اپ (PWA) +

روی اندروید، iOS، ویندوز و وب نصب می‌شود. دریافت اپ

+
+
+
🛡️
+ گزارش و شکایت +

آگهی نادرست یا مرکز متخلف را گزارش کن تا بررسی شود.

+
+
+

شروع سریع (۳ گام)

    diff --git a/src/JobsMedical.Web/Pages/Me/Alerts.cshtml b/src/JobsMedical.Web/Pages/Me/Alerts.cshtml new file mode 100644 index 0000000..2037ff5 --- /dev/null +++ b/src/JobsMedical.Web/Pages/Me/Alerts.cshtml @@ -0,0 +1,134 @@ +@page +@model JobsMedical.Web.Pages.Me.AlertsModel +@{ + ViewData["Title"] = "هشدارهای شغلی"; + string ScopeLabel(JobsMedical.Web.Models.AlertScope s) => s switch + { + JobsMedical.Web.Models.AlertScope.Shifts => "شیفت", + JobsMedical.Web.Models.AlertScope.Jobs => "استخدام", + _ => "شیفت و استخدام", + }; + string ShiftLabel(JobsMedical.Web.Models.ShiftType t) => t switch + { + JobsMedical.Web.Models.ShiftType.Day => "صبح", + JobsMedical.Web.Models.ShiftType.Evening => "عصر", + JobsMedical.Web.Models.ShiftType.Night => "شب", + _ => "آنکال", + }; + string EmpLabel(JobsMedical.Web.Models.EmploymentType t) => t switch + { + JobsMedical.Web.Models.EmploymentType.FullTime => "تمام‌وقت", + JobsMedical.Web.Models.EmploymentType.PartTime => "پاره‌وقت", + JobsMedical.Web.Models.EmploymentType.Contract => "قراردادی", + _ => "طرح", + }; +} + +
    +
    +

    🔎 هشدارهای شغلی

    +

    بگو دنبال چه فرصتی هستی؛ هر وقت کارفرمایی آگهی متناسب ثبت کرد، فوری باخبرت می‌کنیم. ← پنل کارجو

    +
    +
    + +
    + @if (Model.Msg is not null) {
    @Model.Msg
    } + +
    +

    ساخت هشدار جدید

    +
    +
    + + +
    +
    +
    + + +
    +
    + + +
    +
    +
    +
    + + +
    +
    + + +
    +
    +
    + + +

    برای شیفت: مبلغ هر شیفت؛ برای استخدام: حقوق ماهانه. خالی = بدون محدودیت.

    +
    +
    + + +
    + +
    +
    + +

    هشدارهای من (@JalaliDate.ToPersianDigits(Model.Alerts.Count.ToString()))

    + @if (Model.Alerts.Count == 0) + { +
    هنوز هشداری نساخته‌ای. اولین هشدار را بالا بساز تا فرصت‌ها از دستت نروند.
    + } + else + { + foreach (var a in Model.Alerts) + { +
    +
    +
    + @(a.Label ?? "هشدار شغلی") + @if (!a.IsActive) { غیرفعال } +
    + @ScopeLabel(a.Scope) + @if (a.Role is not null) { @a.Role.Name } + @if (a.City is not null) { 📍 @a.City.Name } + @if (a.ShiftType is not null) { @ShiftLabel(a.ShiftType.Value) } + @if (a.EmploymentType is not null) { @EmpLabel(a.EmploymentType.Value) } + @if (a.MinPay is not null) { حداقل @JalaliDate.ToPersianDigits(a.MinPay.Value.ToString("#,0")) تومان } +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + } + } +
    diff --git a/src/JobsMedical.Web/Pages/Me/Alerts.cshtml.cs b/src/JobsMedical.Web/Pages/Me/Alerts.cshtml.cs new file mode 100644 index 0000000..17c0669 --- /dev/null +++ b/src/JobsMedical.Web/Pages/Me/Alerts.cshtml.cs @@ -0,0 +1,79 @@ +using System.Security.Claims; +using JobsMedical.Web.Data; +using JobsMedical.Web.Models; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; +using Microsoft.EntityFrameworkCore; + +namespace JobsMedical.Web.Pages.Me; + +/// Job alerts (هشدار شغلی) — saved searches that notify the user on a new matching listing. +[Authorize] +public class AlertsModel : PageModel +{ + private readonly AppDbContext _db; + public AlertsModel(AppDbContext db) => _db = db; + + public List Roles { get; private set; } = new(); + public List Cities { get; private set; } = new(); + public List Alerts { get; private set; } = new(); + [TempData] public string? Msg { get; set; } + + [BindProperty] public string? Label { get; set; } + [BindProperty] public AlertScope Scope { get; set; } = AlertScope.Any; + [BindProperty] public int? RoleId { get; set; } + [BindProperty] public int? CityId { get; set; } + [BindProperty] public ShiftType? ShiftType { get; set; } + [BindProperty] public EmploymentType? EmploymentType { get; set; } + [BindProperty] public long? MinPay { get; set; } + + private int Uid => int.Parse(User.FindFirstValue(ClaimTypes.NameIdentifier)!); + + public async Task OnGetAsync() => await LoadAsync(); + + public async Task OnPostCreateAsync() + { + if (await _db.JobAlerts.CountAsync(a => a.UserId == Uid) >= 20) + { + Msg = "حداکثر تعداد هشدار شغلی ساخته شده است."; + return RedirectToPage(); + } + _db.JobAlerts.Add(new JobAlert + { + UserId = Uid, + Label = string.IsNullOrWhiteSpace(Label) ? null : Label.Trim(), + Scope = Scope, + RoleId = RoleId, + CityId = CityId, + ShiftType = Scope == AlertScope.Jobs ? null : ShiftType, + EmploymentType = Scope == AlertScope.Shifts ? null : EmploymentType, + MinPay = MinPay is > 0 ? MinPay : null, + }); + await _db.SaveChangesAsync(); + Msg = "هشدار شغلی ساخته شد. به‌محض ثبت آگهی متناسب، باخبر می‌شوی."; + return RedirectToPage(); + } + + public async Task OnPostToggleAsync(int id) + { + var a = await _db.JobAlerts.FirstOrDefaultAsync(x => x.Id == id && x.UserId == Uid); + if (a is not null) { a.IsActive = !a.IsActive; await _db.SaveChangesAsync(); } + return RedirectToPage(); + } + + public async Task OnPostDeleteAsync(int id) + { + var a = await _db.JobAlerts.FirstOrDefaultAsync(x => x.Id == id && x.UserId == Uid); + if (a is not null) { _db.JobAlerts.Remove(a); await _db.SaveChangesAsync(); } + return RedirectToPage(); + } + + private async Task LoadAsync() + { + Roles = await _db.Roles.Where(r => r.IsActive).OrderBy(r => r.SortOrder).ToListAsync(); + Cities = await _db.Cities.Where(c => c.IsActive).OrderBy(c => c.Name).ToListAsync(); + Alerts = await _db.JobAlerts.Include(a => a.Role).Include(a => a.City) + .Where(a => a.UserId == Uid).OrderByDescending(a => a.CreatedAt).ToListAsync(); + } +} diff --git a/src/JobsMedical.Web/Pages/Me/Index.cshtml b/src/JobsMedical.Web/Pages/Me/Index.cshtml index 99c31dd..b61f189 100644 --- a/src/JobsMedical.Web/Pages/Me/Index.cshtml +++ b/src/JobsMedical.Web/Pages/Me/Index.cshtml @@ -35,7 +35,10 @@ }
- تنظیم علاقه‌مندی‌ها + @if (Model.Recommendations.Count > 0) diff --git a/src/JobsMedical.Web/Services/NotificationService.cs b/src/JobsMedical.Web/Services/NotificationService.cs index a1b55ee..93203ec 100644 --- a/src/JobsMedical.Web/Services/NotificationService.cs +++ b/src/JobsMedical.Web/Services/NotificationService.cs @@ -45,7 +45,9 @@ public class NotificationService .FirstOrDefaultAsync(x => x.Id == shiftId); if (s is null) return; - var users = await MatchingUserIdsAsync(s.RoleId, s.Facility.CityId, s.ShiftType); + var prefUsers = await MatchingUserIdsAsync(s.RoleId, s.Facility.CityId, s.ShiftType); + var alertUsers = await ShiftAlertUserIdsAsync(s); + var users = prefUsers.Union(alertUsers).Distinct().ToList(); var title = $"شیفت جدید: {s.Role.Name}"; var body = $"{s.Facility.Name} — {JalaliDate.WeekDayName(s.Date)} {JalaliDate.Time(s.StartTime)}"; await AddAsync(users, title, body, $"/Shifts/Details/{s.Id}"); @@ -57,7 +59,9 @@ public class NotificationService .FirstOrDefaultAsync(x => x.Id == jobId); if (j is null) return; - var users = await MatchingUserIdsAsync(j.RoleId, j.Facility.CityId, null); + var prefUsers = await MatchingUserIdsAsync(j.RoleId, j.Facility.CityId, null); + var alertUsers = await JobAlertUserIdsAsync(j); + var users = prefUsers.Union(alertUsers).Distinct().ToList(); await AddAsync(users, $"استخدام جدید: {j.Title}", j.Facility.Name, $"/Jobs/Details/{j.Id}"); } @@ -75,6 +79,36 @@ public class NotificationService return await q.Distinct().ToListAsync(); } + /// Owners of active job alerts that match this shift. + private async Task> ShiftAlertUserIdsAsync(Shift s) + { + var cityId = s.Facility.CityId; + var districtId = s.Facility.DistrictId; + return await _db.JobAlerts.Where(a => a.IsActive + && a.Scope != AlertScope.Jobs + && (a.RoleId == null || a.RoleId == s.RoleId) + && (a.CityId == null || a.CityId == cityId) + && (a.DistrictId == null || a.DistrictId == districtId) + && (a.ShiftType == null || a.ShiftType == s.ShiftType) + && (a.MinPay == null || (s.PayAmount != null && s.PayAmount >= a.MinPay))) + .Select(a => a.UserId).Distinct().ToListAsync(); + } + + /// Owners of active job alerts that match this hiring opening. + private async Task> JobAlertUserIdsAsync(JobOpening j) + { + var cityId = j.Facility.CityId; + var districtId = j.Facility.DistrictId; + return await _db.JobAlerts.Where(a => a.IsActive + && a.Scope != AlertScope.Shifts + && (a.RoleId == null || a.RoleId == j.RoleId) + && (a.CityId == null || a.CityId == cityId) + && (a.DistrictId == null || a.DistrictId == districtId) + && (a.EmploymentType == null || a.EmploymentType == j.EmploymentType) + && (a.MinPay == null || ((j.SalaryMax ?? j.SalaryMin) != null && (j.SalaryMax ?? j.SalaryMin) >= a.MinPay))) + .Select(a => a.UserId).Distinct().ToListAsync(); + } + private async Task AddAsync(List userIds, string title, string? body, string url) { if (userIds.Count == 0) return;