diff --git a/DysonNetwork.Drive/DysonNetwork.Drive.csproj b/DysonNetwork.Drive/DysonNetwork.Drive.csproj
index 199eb2d..9edd5ba 100644
--- a/DysonNetwork.Drive/DysonNetwork.Drive.csproj
+++ b/DysonNetwork.Drive/DysonNetwork.Drive.csproj
@@ -11,7 +11,11 @@
-
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
@@ -20,30 +24,30 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/DysonNetwork.Drive/Migrations/20250713121317_InitialMigration.Designer.cs b/DysonNetwork.Drive/Migrations/20250713121317_InitialMigration.Designer.cs
new file mode 100644
index 0000000..cdcbf47
--- /dev/null
+++ b/DysonNetwork.Drive/Migrations/20250713121317_InitialMigration.Designer.cs
@@ -0,0 +1,189 @@
+//
+using System;
+using System.Collections.Generic;
+using DysonNetwork.Drive;
+using DysonNetwork.Drive.Storage;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using NodaTime;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace DysonNetwork.Drive.Migrations
+{
+ [DbContext(typeof(AppDatabase))]
+ [Migration("20250713121317_InitialMigration")]
+ partial class InitialMigration
+ {
+ ///
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "9.0.7")
+ .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+ NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "postgis");
+ NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+ modelBuilder.Entity("DysonNetwork.Drive.Storage.CloudFile", b =>
+ {
+ b.Property("Id")
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("id");
+
+ b.Property("AccountId")
+ .HasColumnType("uuid")
+ .HasColumnName("account_id");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("Description")
+ .HasMaxLength(4096)
+ .HasColumnType("character varying(4096)")
+ .HasColumnName("description");
+
+ b.Property>("FileMeta")
+ .HasColumnType("jsonb")
+ .HasColumnName("file_meta");
+
+ b.Property("HasCompression")
+ .HasColumnType("boolean")
+ .HasColumnName("has_compression");
+
+ b.Property("Hash")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("hash");
+
+ b.Property("IsMarkedRecycle")
+ .HasColumnType("boolean")
+ .HasColumnName("is_marked_recycle");
+
+ b.Property("MimeType")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("mime_type");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)")
+ .HasColumnName("name");
+
+ b.Property>("SensitiveMarks")
+ .HasColumnType("jsonb")
+ .HasColumnName("sensitive_marks");
+
+ b.Property("Size")
+ .HasColumnType("bigint")
+ .HasColumnName("size");
+
+ b.Property("StorageId")
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("storage_id");
+
+ b.Property("StorageUrl")
+ .HasMaxLength(4096)
+ .HasColumnType("character varying(4096)")
+ .HasColumnName("storage_url");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.Property("UploadedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("uploaded_at");
+
+ b.Property("UploadedTo")
+ .HasMaxLength(128)
+ .HasColumnType("character varying(128)")
+ .HasColumnName("uploaded_to");
+
+ b.Property>("UserMeta")
+ .HasColumnType("jsonb")
+ .HasColumnName("user_meta");
+
+ b.HasKey("Id")
+ .HasName("pk_files");
+
+ b.ToTable("files", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Drive.Storage.CloudFileReference", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("ExpiredAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("expired_at");
+
+ b.Property("FileId")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("file_id");
+
+ b.Property("ResourceId")
+ .IsRequired()
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)")
+ .HasColumnName("resource_id");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.Property("Usage")
+ .IsRequired()
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)")
+ .HasColumnName("usage");
+
+ b.HasKey("Id")
+ .HasName("pk_file_references");
+
+ b.HasIndex("FileId")
+ .HasDatabaseName("ix_file_references_file_id");
+
+ b.ToTable("file_references", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Drive.Storage.CloudFileReference", b =>
+ {
+ b.HasOne("DysonNetwork.Drive.Storage.CloudFile", "File")
+ .WithMany()
+ .HasForeignKey("FileId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_file_references_files_file_id");
+
+ b.Navigation("File");
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
diff --git a/DysonNetwork.Drive/Migrations/20250713121317_InitialMigration.cs b/DysonNetwork.Drive/Migrations/20250713121317_InitialMigration.cs
new file mode 100644
index 0000000..48977cd
--- /dev/null
+++ b/DysonNetwork.Drive/Migrations/20250713121317_InitialMigration.cs
@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Generic;
+using DysonNetwork.Drive.Storage;
+using Microsoft.EntityFrameworkCore.Migrations;
+using NodaTime;
+
+#nullable disable
+
+namespace DysonNetwork.Drive.Migrations
+{
+ ///
+ public partial class InitialMigration : Migration
+ {
+ ///
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.AlterDatabase()
+ .Annotation("Npgsql:PostgresExtension:postgis", ",,");
+
+ migrationBuilder.CreateTable(
+ name: "files",
+ columns: table => new
+ {
+ id = table.Column(type: "character varying(32)", maxLength: 32, nullable: false),
+ name = table.Column(type: "character varying(1024)", maxLength: 1024, nullable: false),
+ description = table.Column(type: "character varying(4096)", maxLength: 4096, nullable: true),
+ file_meta = table.Column>(type: "jsonb", nullable: true),
+ user_meta = table.Column>(type: "jsonb", nullable: true),
+ sensitive_marks = table.Column>(type: "jsonb", nullable: true),
+ mime_type = table.Column(type: "character varying(256)", maxLength: 256, nullable: true),
+ hash = table.Column(type: "character varying(256)", maxLength: 256, nullable: true),
+ size = table.Column(type: "bigint", nullable: false),
+ uploaded_at = table.Column(type: "timestamp with time zone", nullable: true),
+ uploaded_to = table.Column(type: "character varying(128)", maxLength: 128, nullable: true),
+ has_compression = table.Column(type: "boolean", nullable: false),
+ is_marked_recycle = table.Column(type: "boolean", nullable: false),
+ storage_id = table.Column(type: "character varying(32)", maxLength: 32, nullable: true),
+ storage_url = table.Column(type: "character varying(4096)", maxLength: 4096, nullable: true),
+ account_id = table.Column(type: "uuid", nullable: false),
+ created_at = table.Column(type: "timestamp with time zone", nullable: false),
+ updated_at = table.Column(type: "timestamp with time zone", nullable: false),
+ deleted_at = table.Column(type: "timestamp with time zone", nullable: true)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("pk_files", x => x.id);
+ });
+
+ migrationBuilder.CreateTable(
+ name: "file_references",
+ columns: table => new
+ {
+ id = table.Column(type: "uuid", nullable: false),
+ file_id = table.Column(type: "character varying(32)", maxLength: 32, nullable: false),
+ usage = table.Column(type: "character varying(1024)", maxLength: 1024, nullable: false),
+ resource_id = table.Column(type: "character varying(1024)", maxLength: 1024, nullable: false),
+ expired_at = table.Column(type: "timestamp with time zone", nullable: true),
+ created_at = table.Column(type: "timestamp with time zone", nullable: false),
+ updated_at = table.Column(type: "timestamp with time zone", nullable: false),
+ deleted_at = table.Column(type: "timestamp with time zone", nullable: true)
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("pk_file_references", x => x.id);
+ table.ForeignKey(
+ name: "fk_file_references_files_file_id",
+ column: x => x.file_id,
+ principalTable: "files",
+ principalColumn: "id",
+ onDelete: ReferentialAction.Cascade);
+ });
+
+ migrationBuilder.CreateIndex(
+ name: "ix_file_references_file_id",
+ table: "file_references",
+ column: "file_id");
+ }
+
+ ///
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropTable(
+ name: "file_references");
+
+ migrationBuilder.DropTable(
+ name: "files");
+ }
+ }
+}
diff --git a/DysonNetwork.Drive/Migrations/AppDatabaseModelSnapshot.cs b/DysonNetwork.Drive/Migrations/AppDatabaseModelSnapshot.cs
new file mode 100644
index 0000000..e8d6e77
--- /dev/null
+++ b/DysonNetwork.Drive/Migrations/AppDatabaseModelSnapshot.cs
@@ -0,0 +1,186 @@
+//
+using System;
+using System.Collections.Generic;
+using DysonNetwork.Drive;
+using DysonNetwork.Drive.Storage;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using NodaTime;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace DysonNetwork.Drive.Migrations
+{
+ [DbContext(typeof(AppDatabase))]
+ partial class AppDatabaseModelSnapshot : ModelSnapshot
+ {
+ protected override void BuildModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "9.0.7")
+ .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+ NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "postgis");
+ NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+ modelBuilder.Entity("DysonNetwork.Drive.Storage.CloudFile", b =>
+ {
+ b.Property("Id")
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("id");
+
+ b.Property("AccountId")
+ .HasColumnType("uuid")
+ .HasColumnName("account_id");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("Description")
+ .HasMaxLength(4096)
+ .HasColumnType("character varying(4096)")
+ .HasColumnName("description");
+
+ b.Property>("FileMeta")
+ .HasColumnType("jsonb")
+ .HasColumnName("file_meta");
+
+ b.Property("HasCompression")
+ .HasColumnType("boolean")
+ .HasColumnName("has_compression");
+
+ b.Property("Hash")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("hash");
+
+ b.Property("IsMarkedRecycle")
+ .HasColumnType("boolean")
+ .HasColumnName("is_marked_recycle");
+
+ b.Property("MimeType")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("mime_type");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)")
+ .HasColumnName("name");
+
+ b.Property>("SensitiveMarks")
+ .HasColumnType("jsonb")
+ .HasColumnName("sensitive_marks");
+
+ b.Property("Size")
+ .HasColumnType("bigint")
+ .HasColumnName("size");
+
+ b.Property("StorageId")
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("storage_id");
+
+ b.Property("StorageUrl")
+ .HasMaxLength(4096)
+ .HasColumnType("character varying(4096)")
+ .HasColumnName("storage_url");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.Property("UploadedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("uploaded_at");
+
+ b.Property("UploadedTo")
+ .HasMaxLength(128)
+ .HasColumnType("character varying(128)")
+ .HasColumnName("uploaded_to");
+
+ b.Property>("UserMeta")
+ .HasColumnType("jsonb")
+ .HasColumnName("user_meta");
+
+ b.HasKey("Id")
+ .HasName("pk_files");
+
+ b.ToTable("files", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Drive.Storage.CloudFileReference", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("ExpiredAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("expired_at");
+
+ b.Property("FileId")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("file_id");
+
+ b.Property("ResourceId")
+ .IsRequired()
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)")
+ .HasColumnName("resource_id");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.Property("Usage")
+ .IsRequired()
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)")
+ .HasColumnName("usage");
+
+ b.HasKey("Id")
+ .HasName("pk_file_references");
+
+ b.HasIndex("FileId")
+ .HasDatabaseName("ix_file_references_file_id");
+
+ b.ToTable("file_references", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Drive.Storage.CloudFileReference", b =>
+ {
+ b.HasOne("DysonNetwork.Drive.Storage.CloudFile", "File")
+ .WithMany()
+ .HasForeignKey("FileId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired()
+ .HasConstraintName("fk_file_references_files_file_id");
+
+ b.Navigation("File");
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
diff --git a/DysonNetwork.Drive/appsettings.json b/DysonNetwork.Drive/appsettings.json
index 82c1088..721bba8 100644
--- a/DysonNetwork.Drive/appsettings.json
+++ b/DysonNetwork.Drive/appsettings.json
@@ -10,7 +10,8 @@
"AllowedHosts": "*",
"ConnectionStrings": {
"App": "Host=localhost;Port=5432;Database=dyson_network;Username=postgres;Password=postgres;Include Error Detail=True;Maximum Pool Size=20;Connection Idle Lifetime=60",
- "FastRetrieve": "localhost:6379"
+ "FastRetrieve": "localhost:6379",
+ "Etcd": "etcd.orb.local:2379"
},
"Authentication": {
"Schemes": {
@@ -125,5 +126,11 @@
"KnownProxies": [
"127.0.0.1",
"::1"
- ]
+ ],
+ "Service": {
+ "Name": "DysonNetwork.Drive",
+ "Url": "http://localhost:5216",
+ "ClientCert": "../Certificates/client.crt",
+ "ClientKey": "../Certificates/client.key"
+ }
}
diff --git a/DysonNetwork.Pass/Account/AccountService.cs b/DysonNetwork.Pass/Account/AccountService.cs
index f376468..5aea9c6 100644
--- a/DysonNetwork.Pass/Account/AccountService.cs
+++ b/DysonNetwork.Pass/Account/AccountService.cs
@@ -5,11 +5,13 @@ using DysonNetwork.Pass.Email;
using DysonNetwork.Pass.Localization;
using DysonNetwork.Pass.Permission;
using DysonNetwork.Shared.Cache;
+using DysonNetwork.Shared.Proto;
using EFCore.BulkExtensions;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Localization;
using NodaTime;
using OtpNet;
+using AuthSession = DysonNetwork.Pass.Auth.AuthSession;
namespace DysonNetwork.Pass.Account;
@@ -17,8 +19,8 @@ public class AccountService(
AppDatabase db,
MagicSpellService spells,
AccountUsernameService uname,
- NotificationService nty,
EmailService mailer,
+ PusherService.PusherServiceClient pusher,
IStringLocalizer localizer,
ICacheService cache,
ILogger logger
@@ -353,13 +355,18 @@ public class AccountService(
if (await _GetFactorCode(factor) is not null)
throw new InvalidOperationException("A factor code has been sent and in active duration.");
- await nty.SendNotification(
- account,
- "auth.verification",
- localizer["AuthCodeTitle"],
- null,
- localizer["AuthCodeBody", code],
- save: true
+ await pusher.SendPushNotificationToUserAsync(
+ new SendPushNotificationToUserRequest
+ {
+ UserId = account.Id.ToString(),
+ Notification = new PushNotification
+ {
+ Topic = "auth.verification",
+ Title = localizer["AuthCodeTitle"],
+ Body = localizer["AuthCodeBody", code],
+ IsSavable = false
+ }
+ }
);
await _SetFactorCode(factor, code, TimeSpan.FromMinutes(5));
break;
@@ -489,7 +496,7 @@ public class AccountService(
.ToListAsync();
if (session.Challenge.DeviceId is not null)
- await nty.UnsubscribePushNotifications(session.Challenge.DeviceId);
+ await pusher.UnsubscribePushNotifications(session.Challenge.DeviceId);
// The current session should be included in the sessions' list
await db.AuthSessions
diff --git a/DysonNetwork.Pass/Account/NotificationService.cs b/DysonNetwork.Pass/Account/NotificationService.cs
deleted file mode 100644
index 202ded6..0000000
--- a/DysonNetwork.Pass/Account/NotificationService.cs
+++ /dev/null
@@ -1,292 +0,0 @@
-using System.Text;
-using System.Text.Json;
-using DysonNetwork.Pass;
-using EFCore.BulkExtensions;
-using Microsoft.EntityFrameworkCore;
-using NodaTime;
-
-namespace DysonNetwork.Pass.Account;
-
-public class NotificationService(
- AppDatabase db,
- IHttpClientFactory httpFactory,
- IConfiguration config
-)
-{
- private readonly string _notifyTopic = config["Notifications:Topic"]!;
- private readonly Uri _notifyEndpoint = new(config["Notifications:Endpoint"]!);
-
- public async Task UnsubscribePushNotifications(string deviceId)
- {
- await db.NotificationPushSubscriptions
- .Where(s => s.DeviceId == deviceId)
- .ExecuteDeleteAsync();
- }
-
- public async Task SubscribePushNotification(
- Account account,
- NotificationPushProvider provider,
- string deviceId,
- string deviceToken
- )
- {
- var now = SystemClock.Instance.GetCurrentInstant();
-
- // First check if a matching subscription exists
- var existingSubscription = await db.NotificationPushSubscriptions
- .Where(s => s.AccountId == account.Id)
- .Where(s => s.DeviceId == deviceId || s.DeviceToken == deviceToken)
- .FirstOrDefaultAsync();
-
- if (existingSubscription is not null)
- {
- // Update the existing subscription directly in the database
- await db.NotificationPushSubscriptions
- .Where(s => s.Id == existingSubscription.Id)
- .ExecuteUpdateAsync(setters => setters
- .SetProperty(s => s.DeviceId, deviceId)
- .SetProperty(s => s.DeviceToken, deviceToken)
- .SetProperty(s => s.UpdatedAt, now));
-
- // Return the updated subscription
- existingSubscription.DeviceId = deviceId;
- existingSubscription.DeviceToken = deviceToken;
- existingSubscription.UpdatedAt = now;
- return existingSubscription;
- }
-
- var subscription = new NotificationPushSubscription
- {
- DeviceId = deviceId,
- DeviceToken = deviceToken,
- Provider = provider,
- AccountId = account.Id,
- };
-
- db.NotificationPushSubscriptions.Add(subscription);
- await db.SaveChangesAsync();
-
- return subscription;
- }
-
- public async Task SendNotification(
- Account account,
- string topic,
- string? title = null,
- string? subtitle = null,
- string? content = null,
- Dictionary? meta = null,
- string? actionUri = null,
- bool isSilent = false,
- bool save = true
- )
- {
- if (title is null && subtitle is null && content is null)
- throw new ArgumentException("Unable to send notification that completely empty.");
-
- meta ??= new Dictionary();
- if (actionUri is not null) meta["action_uri"] = actionUri;
-
- var notification = new Notification
- {
- Topic = topic,
- Title = title,
- Subtitle = subtitle,
- Content = content,
- Meta = meta,
- AccountId = account.Id,
- };
-
- if (save)
- {
- db.Add(notification);
- await db.SaveChangesAsync();
- }
-
- if (!isSilent) _ = DeliveryNotification(notification);
-
- return notification;
- }
-
- public async Task DeliveryNotification(Notification notification)
- {
- // Pushing the notification
- var subscribers = await db.NotificationPushSubscriptions
- .Where(s => s.AccountId == notification.AccountId)
- .ToListAsync();
-
- await _PushNotification(notification, subscribers);
- }
-
- public async Task MarkNotificationsViewed(ICollection notifications)
- {
- var now = SystemClock.Instance.GetCurrentInstant();
- var id = notifications.Where(n => n.ViewedAt == null).Select(n => n.Id).ToList();
- if (id.Count == 0) return;
-
- await db.Notifications
- .Where(n => id.Contains(n.Id))
- .ExecuteUpdateAsync(s => s.SetProperty(n => n.ViewedAt, now)
- );
- }
-
- public async Task BroadcastNotification(Notification notification, bool save = false)
- {
- var accounts = await db.Accounts.ToListAsync();
-
- if (save)
- {
- var notifications = accounts.Select(x =>
- {
- var newNotification = new Notification
- {
- Topic = notification.Topic,
- Title = notification.Title,
- Subtitle = notification.Subtitle,
- Content = notification.Content,
- Meta = notification.Meta,
- Priority = notification.Priority,
- Account = x,
- AccountId = x.Id
- };
- return newNotification;
- }).ToList();
- await db.BulkInsertAsync(notifications);
- }
-
- foreach (var account in accounts)
- {
- notification.Account = account;
- notification.AccountId = account.Id;
- }
-
- var subscribers = await db.NotificationPushSubscriptions
- .ToListAsync();
- await _PushNotification(notification, subscribers);
- }
-
- public async Task SendNotificationBatch(Notification notification, List accounts, bool save = false)
- {
- if (save)
- {
- var notifications = accounts.Select(x =>
- {
- var newNotification = new Notification
- {
- Topic = notification.Topic,
- Title = notification.Title,
- Subtitle = notification.Subtitle,
- Content = notification.Content,
- Meta = notification.Meta,
- Priority = notification.Priority,
- Account = x,
- AccountId = x.Id
- };
- return newNotification;
- }).ToList();
- await db.BulkInsertAsync(notifications);
- }
-
- foreach (var account in accounts)
- {
- notification.Account = account;
- notification.AccountId = account.Id;
- }
-
- var accountsId = accounts.Select(x => x.Id).ToList();
- var subscribers = await db.NotificationPushSubscriptions
- .Where(s => accountsId.Contains(s.AccountId))
- .ToListAsync();
- await _PushNotification(notification, subscribers);
- }
-
- private List> _BuildNotificationPayload(Notification notification,
- IEnumerable subscriptions)
- {
- var subDict = subscriptions
- .GroupBy(x => x.Provider)
- .ToDictionary(x => x.Key, x => x.ToList());
-
- var notifications = subDict.Select(value =>
- {
- var platformCode = value.Key switch
- {
- NotificationPushProvider.Apple => 1,
- NotificationPushProvider.Google => 2,
- _ => throw new InvalidOperationException($"Unknown push provider: {value.Key}")
- };
-
- var tokens = value.Value.Select(x => x.DeviceToken).ToList();
- return _BuildNotificationPayload(notification, platformCode, tokens);
- }).ToList();
-
- return notifications.ToList();
- }
-
- private Dictionary _BuildNotificationPayload(Notification notification, int platformCode,
- IEnumerable deviceTokens)
- {
- var alertDict = new Dictionary();
- var dict = new Dictionary
- {
- ["notif_id"] = notification.Id.ToString(),
- ["apns_id"] = notification.Id.ToString(),
- ["topic"] = _notifyTopic,
- ["tokens"] = deviceTokens,
- ["data"] = new Dictionary
- {
- ["type"] = notification.Topic,
- ["meta"] = notification.Meta ?? new Dictionary(),
- },
- ["mutable_content"] = true,
- ["priority"] = notification.Priority >= 5 ? "high" : "normal",
- };
-
- if (!string.IsNullOrWhiteSpace(notification.Title))
- {
- dict["title"] = notification.Title;
- alertDict["title"] = notification.Title;
- }
-
- if (!string.IsNullOrWhiteSpace(notification.Content))
- {
- dict["message"] = notification.Content;
- alertDict["body"] = notification.Content;
- }
-
- if (!string.IsNullOrWhiteSpace(notification.Subtitle))
- {
- dict["message"] = $"{notification.Subtitle}\n{dict["message"]}";
- alertDict["subtitle"] = notification.Subtitle;
- }
-
- if (notification.Priority >= 5)
- dict["name"] = "default";
-
- dict["platform"] = platformCode;
- dict["alert"] = alertDict;
-
- return dict;
- }
-
- private async Task _PushNotification(Notification notification,
- IEnumerable subscriptions)
- {
- var subList = subscriptions.ToList();
- if (subList.Count == 0) return;
-
- var requestDict = new Dictionary
- {
- ["notifications"] = _BuildNotificationPayload(notification, subList)
- };
-
- var client = httpFactory.CreateClient();
- client.BaseAddress = _notifyEndpoint;
- var request = await client.PostAsync("/push", new StringContent(
- JsonSerializer.Serialize(requestDict),
- Encoding.UTF8,
- "application/json"
- ));
- request.EnsureSuccessStatusCode();
- }
-}
\ No newline at end of file
diff --git a/DysonNetwork.Pass/DysonNetwork.Pass.csproj b/DysonNetwork.Pass/DysonNetwork.Pass.csproj
index e13db9f..b781b58 100644
--- a/DysonNetwork.Pass/DysonNetwork.Pass.csproj
+++ b/DysonNetwork.Pass/DysonNetwork.Pass.csproj
@@ -9,6 +9,10 @@
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
diff --git a/DysonNetwork.Pass/Email/EmailService.cs b/DysonNetwork.Pass/Email/EmailService.cs
index b8bb428..7cf34ee 100644
--- a/DysonNetwork.Pass/Email/EmailService.cs
+++ b/DysonNetwork.Pass/Email/EmailService.cs
@@ -1,33 +1,23 @@
using dotnet_etcd;
+using dotnet_etcd.interfaces;
using DysonNetwork.Shared.Proto;
using Microsoft.AspNetCore.Components;
namespace DysonNetwork.Pass.Email;
-public class EmailService
+public class EmailService(
+ IEtcdClient etcd,
+ RazorViewRenderer viewRenderer,
+ IConfiguration configuration,
+ ILogger logger
+)
{
- private readonly PusherService.PusherServiceClient _client;
- private readonly RazorViewRenderer _viewRenderer;
- private readonly ILogger _logger;
+ private readonly PusherService.PusherServiceClient _client = GrpcClientHelper.CreatePusherServiceClient(
+ etcd,
+ configuration["Service:CertPath"]!,
+ configuration["Service:KeyPath"]!
+ ).GetAwaiter().GetResult();
- public EmailService(
- EtcdClient etcd,
- RazorViewRenderer viewRenderer,
- IConfiguration configuration,
- ILogger logger,
- PusherService.PusherServiceClient client
- )
- {
- _client = GrpcClientHelper.CreatePusherServiceClient(
- etcd,
- configuration["Service:CertPath"]!,
- configuration["Service:KeyPath"]!
- ).GetAwaiter().GetResult();
- _viewRenderer = viewRenderer;
- _logger = logger;
- _client = client;
- }
-
public async Task SendEmailAsync(
string? recipientName,
string recipientEmail,
@@ -57,12 +47,12 @@ public class EmailService
{
try
{
- var htmlBody = await _viewRenderer.RenderComponentToStringAsync(model);
+ var htmlBody = await viewRenderer.RenderComponentToStringAsync(model);
await SendEmailAsync(recipientName, recipientEmail, subject, htmlBody);
}
catch (Exception err)
{
- _logger.LogError(err, "Failed to render email template...");
+ logger.LogError(err, "Failed to render email template...");
throw;
}
}
diff --git a/DysonNetwork.Pass/Migrations/20250713121237_InitialMigration.Designer.cs b/DysonNetwork.Pass/Migrations/20250713121237_InitialMigration.Designer.cs
new file mode 100644
index 0000000..21c1ca2
--- /dev/null
+++ b/DysonNetwork.Pass/Migrations/20250713121237_InitialMigration.Designer.cs
@@ -0,0 +1,1977 @@
+//
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using DysonNetwork.Pass;
+using DysonNetwork.Pass.Account;
+using DysonNetwork.Pass.Developer;
+using DysonNetwork.Pass.Wallet;
+using DysonNetwork.Shared.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using NetTopologySuite.Geometries;
+using NodaTime;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+
+#nullable disable
+
+namespace DysonNetwork.Pass.Migrations
+{
+ [DbContext(typeof(AppDatabase))]
+ [Migration("20250713121237_InitialMigration")]
+ partial class InitialMigration
+ {
+ ///
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "9.0.7")
+ .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+ NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "postgis");
+ NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+
+ modelBuilder.Entity("DysonNetwork.Pass.Account.AbuseReport", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("AccountId")
+ .HasColumnType("uuid")
+ .HasColumnName("account_id");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("Reason")
+ .IsRequired()
+ .HasMaxLength(8192)
+ .HasColumnType("character varying(8192)")
+ .HasColumnName("reason");
+
+ b.Property("Resolution")
+ .HasMaxLength(8192)
+ .HasColumnType("character varying(8192)")
+ .HasColumnName("resolution");
+
+ b.Property("ResolvedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("resolved_at");
+
+ b.Property("ResourceIdentifier")
+ .IsRequired()
+ .HasMaxLength(4096)
+ .HasColumnType("character varying(4096)")
+ .HasColumnName("resource_identifier");
+
+ b.Property("Type")
+ .HasColumnType("integer")
+ .HasColumnName("type");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.HasKey("Id")
+ .HasName("pk_abuse_reports");
+
+ b.HasIndex("AccountId")
+ .HasDatabaseName("ix_abuse_reports_account_id");
+
+ b.ToTable("abuse_reports", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Pass.Account.Account", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("ActivatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("activated_at");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("IsSuperuser")
+ .HasColumnType("boolean")
+ .HasColumnName("is_superuser");
+
+ b.Property("Language")
+ .IsRequired()
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("language");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("name");
+
+ b.Property("Nick")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("nick");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.HasKey("Id")
+ .HasName("pk_accounts");
+
+ b.HasIndex("Name")
+ .IsUnique()
+ .HasDatabaseName("ix_accounts_name");
+
+ b.ToTable("accounts", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Pass.Account.AccountAuthFactor", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("AccountId")
+ .HasColumnType("uuid")
+ .HasColumnName("account_id");
+
+ b.Property>("Config")
+ .HasColumnType("jsonb")
+ .HasColumnName("config");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("EnabledAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("enabled_at");
+
+ b.Property("ExpiredAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("expired_at");
+
+ b.Property("Secret")
+ .HasMaxLength(8196)
+ .HasColumnType("character varying(8196)")
+ .HasColumnName("secret");
+
+ b.Property("Trustworthy")
+ .HasColumnType("integer")
+ .HasColumnName("trustworthy");
+
+ b.Property("Type")
+ .HasColumnType("integer")
+ .HasColumnName("type");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.HasKey("Id")
+ .HasName("pk_account_auth_factors");
+
+ b.HasIndex("AccountId")
+ .HasDatabaseName("ix_account_auth_factors_account_id");
+
+ b.ToTable("account_auth_factors", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Pass.Account.AccountBadge", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("AccountId")
+ .HasColumnType("uuid")
+ .HasColumnName("account_id");
+
+ b.Property("ActivatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("activated_at");
+
+ b.Property("Caption")
+ .HasMaxLength(4096)
+ .HasColumnType("character varying(4096)")
+ .HasColumnName("caption");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("ExpiredAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("expired_at");
+
+ b.Property("Label")
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)")
+ .HasColumnName("label");
+
+ b.Property>("Meta")
+ .IsRequired()
+ .HasColumnType("jsonb")
+ .HasColumnName("meta");
+
+ b.Property("Type")
+ .IsRequired()
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)")
+ .HasColumnName("type");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.HasKey("Id")
+ .HasName("pk_badges");
+
+ b.HasIndex("AccountId")
+ .HasDatabaseName("ix_badges_account_id");
+
+ b.ToTable("badges", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Pass.Account.AccountConnection", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("AccessToken")
+ .HasMaxLength(4096)
+ .HasColumnType("character varying(4096)")
+ .HasColumnName("access_token");
+
+ b.Property("AccountId")
+ .HasColumnType("uuid")
+ .HasColumnName("account_id");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("LastUsedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("last_used_at");
+
+ b.Property>("Meta")
+ .HasColumnType("jsonb")
+ .HasColumnName("meta");
+
+ b.Property("ProvidedIdentifier")
+ .IsRequired()
+ .HasMaxLength(8192)
+ .HasColumnType("character varying(8192)")
+ .HasColumnName("provided_identifier");
+
+ b.Property("Provider")
+ .IsRequired()
+ .HasMaxLength(4096)
+ .HasColumnType("character varying(4096)")
+ .HasColumnName("provider");
+
+ b.Property("RefreshToken")
+ .HasMaxLength(4096)
+ .HasColumnType("character varying(4096)")
+ .HasColumnName("refresh_token");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.HasKey("Id")
+ .HasName("pk_account_connections");
+
+ b.HasIndex("AccountId")
+ .HasDatabaseName("ix_account_connections_account_id");
+
+ b.ToTable("account_connections", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Pass.Account.AccountContact", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("AccountId")
+ .HasColumnType("uuid")
+ .HasColumnName("account_id");
+
+ b.Property("Content")
+ .IsRequired()
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)")
+ .HasColumnName("content");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("IsPrimary")
+ .HasColumnType("boolean")
+ .HasColumnName("is_primary");
+
+ b.Property("Type")
+ .HasColumnType("integer")
+ .HasColumnName("type");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.Property("VerifiedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("verified_at");
+
+ b.HasKey("Id")
+ .HasName("pk_account_contacts");
+
+ b.HasIndex("AccountId")
+ .HasDatabaseName("ix_account_contacts_account_id");
+
+ b.ToTable("account_contacts", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Pass.Account.AccountProfile", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("AccountId")
+ .HasColumnType("uuid")
+ .HasColumnName("account_id");
+
+ b.Property("ActiveBadge")
+ .HasColumnType("jsonb")
+ .HasColumnName("active_badge");
+
+ b.Property("Background")
+ .HasColumnType("jsonb")
+ .HasColumnName("background");
+
+ b.Property("BackgroundId")
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("background_id");
+
+ b.Property("Bio")
+ .HasMaxLength(4096)
+ .HasColumnType("character varying(4096)")
+ .HasColumnName("bio");
+
+ b.Property("Birthday")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("birthday");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("Experience")
+ .HasColumnType("integer")
+ .HasColumnName("experience");
+
+ b.Property("FirstName")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("first_name");
+
+ b.Property("Gender")
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)")
+ .HasColumnName("gender");
+
+ b.Property("LastName")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("last_name");
+
+ b.Property("LastSeenAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("last_seen_at");
+
+ b.Property("Location")
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)")
+ .HasColumnName("location");
+
+ b.Property("MiddleName")
+ .HasMaxLength(256)
+ .HasColumnType("character varying(256)")
+ .HasColumnName("middle_name");
+
+ b.Property("Picture")
+ .HasColumnType("jsonb")
+ .HasColumnName("picture");
+
+ b.Property("PictureId")
+ .HasMaxLength(32)
+ .HasColumnType("character varying(32)")
+ .HasColumnName("picture_id");
+
+ b.Property("Pronouns")
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)")
+ .HasColumnName("pronouns");
+
+ b.Property("TimeZone")
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)")
+ .HasColumnName("time_zone");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.Property("Verification")
+ .HasColumnType("jsonb")
+ .HasColumnName("verification");
+
+ b.HasKey("Id")
+ .HasName("pk_account_profiles");
+
+ b.HasIndex("AccountId")
+ .IsUnique()
+ .HasDatabaseName("ix_account_profiles_account_id");
+
+ b.ToTable("account_profiles", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Pass.Account.ActionLog", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("AccountId")
+ .HasColumnType("uuid")
+ .HasColumnName("account_id");
+
+ b.Property("Action")
+ .IsRequired()
+ .HasMaxLength(4096)
+ .HasColumnType("character varying(4096)")
+ .HasColumnName("action");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("IpAddress")
+ .HasMaxLength(128)
+ .HasColumnType("character varying(128)")
+ .HasColumnName("ip_address");
+
+ b.Property("Location")
+ .HasColumnType("geometry")
+ .HasColumnName("location");
+
+ b.Property>("Meta")
+ .IsRequired()
+ .HasColumnType("jsonb")
+ .HasColumnName("meta");
+
+ b.Property("SessionId")
+ .HasColumnType("uuid")
+ .HasColumnName("session_id");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.Property("UserAgent")
+ .HasMaxLength(512)
+ .HasColumnType("character varying(512)")
+ .HasColumnName("user_agent");
+
+ b.HasKey("Id")
+ .HasName("pk_action_logs");
+
+ b.HasIndex("AccountId")
+ .HasDatabaseName("ix_action_logs_account_id");
+
+ b.ToTable("action_logs", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Pass.Account.CheckInResult", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("AccountId")
+ .HasColumnType("uuid")
+ .HasColumnName("account_id");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("Level")
+ .HasColumnType("integer")
+ .HasColumnName("level");
+
+ b.Property("RewardExperience")
+ .HasColumnType("integer")
+ .HasColumnName("reward_experience");
+
+ b.Property("RewardPoints")
+ .HasColumnType("numeric")
+ .HasColumnName("reward_points");
+
+ b.Property>("Tips")
+ .IsRequired()
+ .HasColumnType("jsonb")
+ .HasColumnName("tips");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.HasKey("Id")
+ .HasName("pk_account_check_in_results");
+
+ b.HasIndex("AccountId")
+ .HasDatabaseName("ix_account_check_in_results_account_id");
+
+ b.ToTable("account_check_in_results", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Pass.Account.MagicSpell", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("AccountId")
+ .HasColumnType("uuid")
+ .HasColumnName("account_id");
+
+ b.Property("AffectedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("affected_at");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("ExpiresAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("expires_at");
+
+ b.Property>("Meta")
+ .IsRequired()
+ .HasColumnType("jsonb")
+ .HasColumnName("meta");
+
+ b.Property("Spell")
+ .IsRequired()
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)")
+ .HasColumnName("spell");
+
+ b.Property("Type")
+ .HasColumnType("integer")
+ .HasColumnName("type");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.HasKey("Id")
+ .HasName("pk_magic_spells");
+
+ b.HasIndex("AccountId")
+ .HasDatabaseName("ix_magic_spells_account_id");
+
+ b.HasIndex("Spell")
+ .IsUnique()
+ .HasDatabaseName("ix_magic_spells_spell");
+
+ b.ToTable("magic_spells", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Pass.Account.Notification", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("AccountId")
+ .HasColumnType("uuid")
+ .HasColumnName("account_id");
+
+ b.Property("Content")
+ .HasMaxLength(4096)
+ .HasColumnType("character varying(4096)")
+ .HasColumnName("content");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property>("Meta")
+ .HasColumnType("jsonb")
+ .HasColumnName("meta");
+
+ b.Property("Priority")
+ .HasColumnType("integer")
+ .HasColumnName("priority");
+
+ b.Property("Subtitle")
+ .HasMaxLength(2048)
+ .HasColumnType("character varying(2048)")
+ .HasColumnName("subtitle");
+
+ b.Property("Title")
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)")
+ .HasColumnName("title");
+
+ b.Property("Topic")
+ .IsRequired()
+ .HasMaxLength(1024)
+ .HasColumnType("character varying(1024)")
+ .HasColumnName("topic");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.Property("ViewedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("viewed_at");
+
+ b.HasKey("Id")
+ .HasName("pk_notifications");
+
+ b.HasIndex("AccountId")
+ .HasDatabaseName("ix_notifications_account_id");
+
+ b.ToTable("notifications", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Pass.Account.NotificationPushSubscription", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("AccountId")
+ .HasColumnType("uuid")
+ .HasColumnName("account_id");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("DeviceId")
+ .IsRequired()
+ .HasMaxLength(4096)
+ .HasColumnType("character varying(4096)")
+ .HasColumnName("device_id");
+
+ b.Property("DeviceToken")
+ .IsRequired()
+ .HasMaxLength(4096)
+ .HasColumnType("character varying(4096)")
+ .HasColumnName("device_token");
+
+ b.Property("LastUsedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("last_used_at");
+
+ b.Property("Provider")
+ .HasColumnType("integer")
+ .HasColumnName("provider");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.HasKey("Id")
+ .HasName("pk_notification_push_subscriptions");
+
+ b.HasIndex("AccountId")
+ .HasDatabaseName("ix_notification_push_subscriptions_account_id");
+
+ b.HasIndex("DeviceToken", "DeviceId", "AccountId")
+ .IsUnique()
+ .HasDatabaseName("ix_notification_push_subscriptions_device_token_device_id_acco");
+
+ b.ToTable("notification_push_subscriptions", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Pass.Account.Relationship", b =>
+ {
+ b.Property("AccountId")
+ .HasColumnType("uuid")
+ .HasColumnName("account_id");
+
+ b.Property("RelatedId")
+ .HasColumnType("uuid")
+ .HasColumnName("related_id");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property("ExpiredAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("expired_at");
+
+ b.Property("Status")
+ .HasColumnType("smallint")
+ .HasColumnName("status");
+
+ b.Property("UpdatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("updated_at");
+
+ b.HasKey("AccountId", "RelatedId")
+ .HasName("pk_account_relationships");
+
+ b.HasIndex("RelatedId")
+ .HasDatabaseName("ix_account_relationships_related_id");
+
+ b.ToTable("account_relationships", (string)null);
+ });
+
+ modelBuilder.Entity("DysonNetwork.Pass.Account.Status", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("uuid")
+ .HasColumnName("id");
+
+ b.Property("AccountId")
+ .HasColumnType("uuid")
+ .HasColumnName("account_id");
+
+ b.Property("Attitude")
+ .HasColumnType("integer")
+ .HasColumnName("attitude");
+
+ b.Property("ClearedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("cleared_at");
+
+ b.Property("CreatedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("created_at");
+
+ b.Property("DeletedAt")
+ .HasColumnType("timestamp with time zone")
+ .HasColumnName("deleted_at");
+
+ b.Property