🐛 Fix drive project missing native deps in docker image
🗑️ Remove notification from account service
This commit is contained in:
@@ -4,6 +4,18 @@ WORKDIR /app
|
|||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
EXPOSE 8081
|
EXPOSE 8081
|
||||||
|
|
||||||
|
# Install only necessary dependencies
|
||||||
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
|
libfontconfig1 \
|
||||||
|
libfreetype6 \
|
||||||
|
libpng-dev \
|
||||||
|
libharfbuzz0b \
|
||||||
|
libgif7 \
|
||||||
|
libvips \
|
||||||
|
ffmpeg \
|
||||||
|
&& apt-get clean \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
|
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
|
||||||
ARG BUILD_CONFIGURATION=Release
|
ARG BUILD_CONFIGURATION=Release
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
|
@@ -1,42 +0,0 @@
|
|||||||
using System.ComponentModel.DataAnnotations;
|
|
||||||
using System.ComponentModel.DataAnnotations.Schema;
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
using DysonNetwork.Shared.Data;
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
|
||||||
using NodaTime;
|
|
||||||
|
|
||||||
namespace DysonNetwork.Pass.Account;
|
|
||||||
|
|
||||||
public class Notification : ModelBase
|
|
||||||
{
|
|
||||||
public Guid Id { get; set; } = Guid.NewGuid();
|
|
||||||
[MaxLength(1024)] public string Topic { get; set; } = null!;
|
|
||||||
[MaxLength(1024)] public string? Title { get; set; }
|
|
||||||
[MaxLength(2048)] public string? Subtitle { get; set; }
|
|
||||||
[MaxLength(4096)] public string? Content { get; set; }
|
|
||||||
[Column(TypeName = "jsonb")] public Dictionary<string, object>? Meta { get; set; }
|
|
||||||
public int Priority { get; set; } = 10;
|
|
||||||
public Instant? ViewedAt { get; set; }
|
|
||||||
|
|
||||||
public Guid AccountId { get; set; }
|
|
||||||
[JsonIgnore] public Account Account { get; set; } = null!;
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum NotificationPushProvider
|
|
||||||
{
|
|
||||||
Apple,
|
|
||||||
Google
|
|
||||||
}
|
|
||||||
|
|
||||||
[Index(nameof(DeviceToken), nameof(DeviceId), nameof(AccountId), IsUnique = true)]
|
|
||||||
public class NotificationPushSubscription : ModelBase
|
|
||||||
{
|
|
||||||
public Guid Id { get; set; } = Guid.NewGuid();
|
|
||||||
[MaxLength(4096)] public string DeviceId { get; set; } = null!;
|
|
||||||
[MaxLength(4096)] public string DeviceToken { get; set; } = null!;
|
|
||||||
public NotificationPushProvider Provider { get; set; }
|
|
||||||
public Instant? LastUsedAt { get; set; }
|
|
||||||
|
|
||||||
public Guid AccountId { get; set; }
|
|
||||||
[JsonIgnore] public Account Account { get; set; } = null!;
|
|
||||||
}
|
|
@@ -32,8 +32,6 @@ public class AppDatabase(
|
|||||||
public DbSet<Relationship> AccountRelationships { get; set; }
|
public DbSet<Relationship> AccountRelationships { get; set; }
|
||||||
public DbSet<Status> AccountStatuses { get; set; }
|
public DbSet<Status> AccountStatuses { get; set; }
|
||||||
public DbSet<CheckInResult> AccountCheckInResults { get; set; }
|
public DbSet<CheckInResult> AccountCheckInResults { get; set; }
|
||||||
public DbSet<Notification> Notifications { get; set; }
|
|
||||||
public DbSet<NotificationPushSubscription> NotificationPushSubscriptions { get; set; }
|
|
||||||
public DbSet<AccountBadge> Badges { get; set; }
|
public DbSet<AccountBadge> Badges { get; set; }
|
||||||
public DbSet<ActionLog> ActionLogs { get; set; }
|
public DbSet<ActionLog> ActionLogs { get; set; }
|
||||||
public DbSet<AbuseReport> AbuseReports { get; set; }
|
public DbSet<AbuseReport> AbuseReports { get; set; }
|
||||||
|
1822
DysonNetwork.Pass/Migrations/20250720193202_RemoveNotification.Designer.cs
generated
Normal file
1822
DysonNetwork.Pass/Migrations/20250720193202_RemoveNotification.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,96 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
using NodaTime;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace DysonNetwork.Pass.Migrations
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class RemoveNotification : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "notification_push_subscriptions");
|
||||||
|
|
||||||
|
migrationBuilder.DropTable(
|
||||||
|
name: "notifications");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "notification_push_subscriptions",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
id = table.Column<Guid>(type: "uuid", nullable: false),
|
||||||
|
account_id = table.Column<Guid>(type: "uuid", nullable: false),
|
||||||
|
created_at = table.Column<Instant>(type: "timestamp with time zone", nullable: false),
|
||||||
|
deleted_at = table.Column<Instant>(type: "timestamp with time zone", nullable: true),
|
||||||
|
device_id = table.Column<string>(type: "character varying(4096)", maxLength: 4096, nullable: false),
|
||||||
|
device_token = table.Column<string>(type: "character varying(4096)", maxLength: 4096, nullable: false),
|
||||||
|
last_used_at = table.Column<Instant>(type: "timestamp with time zone", nullable: true),
|
||||||
|
provider = table.Column<int>(type: "integer", nullable: false),
|
||||||
|
updated_at = table.Column<Instant>(type: "timestamp with time zone", nullable: false)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("pk_notification_push_subscriptions", x => x.id);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "fk_notification_push_subscriptions_accounts_account_id",
|
||||||
|
column: x => x.account_id,
|
||||||
|
principalTable: "accounts",
|
||||||
|
principalColumn: "id",
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateTable(
|
||||||
|
name: "notifications",
|
||||||
|
columns: table => new
|
||||||
|
{
|
||||||
|
id = table.Column<Guid>(type: "uuid", nullable: false),
|
||||||
|
account_id = table.Column<Guid>(type: "uuid", nullable: false),
|
||||||
|
content = table.Column<string>(type: "character varying(4096)", maxLength: 4096, nullable: true),
|
||||||
|
created_at = table.Column<Instant>(type: "timestamp with time zone", nullable: false),
|
||||||
|
deleted_at = table.Column<Instant>(type: "timestamp with time zone", nullable: true),
|
||||||
|
meta = table.Column<Dictionary<string, object>>(type: "jsonb", nullable: true),
|
||||||
|
priority = table.Column<int>(type: "integer", nullable: false),
|
||||||
|
subtitle = table.Column<string>(type: "character varying(2048)", maxLength: 2048, nullable: true),
|
||||||
|
title = table.Column<string>(type: "character varying(1024)", maxLength: 1024, nullable: true),
|
||||||
|
topic = table.Column<string>(type: "character varying(1024)", maxLength: 1024, nullable: false),
|
||||||
|
updated_at = table.Column<Instant>(type: "timestamp with time zone", nullable: false),
|
||||||
|
viewed_at = table.Column<Instant>(type: "timestamp with time zone", nullable: true)
|
||||||
|
},
|
||||||
|
constraints: table =>
|
||||||
|
{
|
||||||
|
table.PrimaryKey("pk_notifications", x => x.id);
|
||||||
|
table.ForeignKey(
|
||||||
|
name: "fk_notifications_accounts_account_id",
|
||||||
|
column: x => x.account_id,
|
||||||
|
principalTable: "accounts",
|
||||||
|
principalColumn: "id",
|
||||||
|
onDelete: ReferentialAction.Cascade);
|
||||||
|
});
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "ix_notification_push_subscriptions_account_id",
|
||||||
|
table: "notification_push_subscriptions",
|
||||||
|
column: "account_id");
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "ix_notification_push_subscriptions_device_token_device_id_acco",
|
||||||
|
table: "notification_push_subscriptions",
|
||||||
|
columns: new[] { "device_token", "device_id", "account_id" },
|
||||||
|
unique: true);
|
||||||
|
|
||||||
|
migrationBuilder.CreateIndex(
|
||||||
|
name: "ix_notifications_account_id",
|
||||||
|
table: "notifications",
|
||||||
|
column: "account_id");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -643,127 +643,6 @@ namespace DysonNetwork.Pass.Migrations
|
|||||||
b.ToTable("magic_spells", (string)null);
|
b.ToTable("magic_spells", (string)null);
|
||||||
});
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("DysonNetwork.Pass.Account.Notification", b =>
|
|
||||||
{
|
|
||||||
b.Property<Guid>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("uuid")
|
|
||||||
.HasColumnName("id");
|
|
||||||
|
|
||||||
b.Property<Guid>("AccountId")
|
|
||||||
.HasColumnType("uuid")
|
|
||||||
.HasColumnName("account_id");
|
|
||||||
|
|
||||||
b.Property<string>("Content")
|
|
||||||
.HasMaxLength(4096)
|
|
||||||
.HasColumnType("character varying(4096)")
|
|
||||||
.HasColumnName("content");
|
|
||||||
|
|
||||||
b.Property<Instant>("CreatedAt")
|
|
||||||
.HasColumnType("timestamp with time zone")
|
|
||||||
.HasColumnName("created_at");
|
|
||||||
|
|
||||||
b.Property<Instant?>("DeletedAt")
|
|
||||||
.HasColumnType("timestamp with time zone")
|
|
||||||
.HasColumnName("deleted_at");
|
|
||||||
|
|
||||||
b.Property<Dictionary<string, object>>("Meta")
|
|
||||||
.HasColumnType("jsonb")
|
|
||||||
.HasColumnName("meta");
|
|
||||||
|
|
||||||
b.Property<int>("Priority")
|
|
||||||
.HasColumnType("integer")
|
|
||||||
.HasColumnName("priority");
|
|
||||||
|
|
||||||
b.Property<string>("Subtitle")
|
|
||||||
.HasMaxLength(2048)
|
|
||||||
.HasColumnType("character varying(2048)")
|
|
||||||
.HasColumnName("subtitle");
|
|
||||||
|
|
||||||
b.Property<string>("Title")
|
|
||||||
.HasMaxLength(1024)
|
|
||||||
.HasColumnType("character varying(1024)")
|
|
||||||
.HasColumnName("title");
|
|
||||||
|
|
||||||
b.Property<string>("Topic")
|
|
||||||
.IsRequired()
|
|
||||||
.HasMaxLength(1024)
|
|
||||||
.HasColumnType("character varying(1024)")
|
|
||||||
.HasColumnName("topic");
|
|
||||||
|
|
||||||
b.Property<Instant>("UpdatedAt")
|
|
||||||
.HasColumnType("timestamp with time zone")
|
|
||||||
.HasColumnName("updated_at");
|
|
||||||
|
|
||||||
b.Property<Instant?>("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<Guid>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("uuid")
|
|
||||||
.HasColumnName("id");
|
|
||||||
|
|
||||||
b.Property<Guid>("AccountId")
|
|
||||||
.HasColumnType("uuid")
|
|
||||||
.HasColumnName("account_id");
|
|
||||||
|
|
||||||
b.Property<Instant>("CreatedAt")
|
|
||||||
.HasColumnType("timestamp with time zone")
|
|
||||||
.HasColumnName("created_at");
|
|
||||||
|
|
||||||
b.Property<Instant?>("DeletedAt")
|
|
||||||
.HasColumnType("timestamp with time zone")
|
|
||||||
.HasColumnName("deleted_at");
|
|
||||||
|
|
||||||
b.Property<string>("DeviceId")
|
|
||||||
.IsRequired()
|
|
||||||
.HasMaxLength(4096)
|
|
||||||
.HasColumnType("character varying(4096)")
|
|
||||||
.HasColumnName("device_id");
|
|
||||||
|
|
||||||
b.Property<string>("DeviceToken")
|
|
||||||
.IsRequired()
|
|
||||||
.HasMaxLength(4096)
|
|
||||||
.HasColumnType("character varying(4096)")
|
|
||||||
.HasColumnName("device_token");
|
|
||||||
|
|
||||||
b.Property<Instant?>("LastUsedAt")
|
|
||||||
.HasColumnType("timestamp with time zone")
|
|
||||||
.HasColumnName("last_used_at");
|
|
||||||
|
|
||||||
b.Property<int>("Provider")
|
|
||||||
.HasColumnType("integer")
|
|
||||||
.HasColumnName("provider");
|
|
||||||
|
|
||||||
b.Property<Instant>("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 =>
|
modelBuilder.Entity("DysonNetwork.Pass.Account.Relationship", b =>
|
||||||
{
|
{
|
||||||
b.Property<Guid>("AccountId")
|
b.Property<Guid>("AccountId")
|
||||||
@@ -1712,30 +1591,6 @@ namespace DysonNetwork.Pass.Migrations
|
|||||||
b.Navigation("Account");
|
b.Navigation("Account");
|
||||||
});
|
});
|
||||||
|
|
||||||
modelBuilder.Entity("DysonNetwork.Pass.Account.Notification", b =>
|
|
||||||
{
|
|
||||||
b.HasOne("DysonNetwork.Pass.Account.Account", "Account")
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey("AccountId")
|
|
||||||
.OnDelete(DeleteBehavior.Cascade)
|
|
||||||
.IsRequired()
|
|
||||||
.HasConstraintName("fk_notifications_accounts_account_id");
|
|
||||||
|
|
||||||
b.Navigation("Account");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("DysonNetwork.Pass.Account.NotificationPushSubscription", b =>
|
|
||||||
{
|
|
||||||
b.HasOne("DysonNetwork.Pass.Account.Account", "Account")
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey("AccountId")
|
|
||||||
.OnDelete(DeleteBehavior.Cascade)
|
|
||||||
.IsRequired()
|
|
||||||
.HasConstraintName("fk_notification_push_subscriptions_accounts_account_id");
|
|
||||||
|
|
||||||
b.Navigation("Account");
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("DysonNetwork.Pass.Account.Relationship", b =>
|
modelBuilder.Entity("DysonNetwork.Pass.Account.Relationship", b =>
|
||||||
{
|
{
|
||||||
b.HasOne("DysonNetwork.Pass.Account.Account", "Account")
|
b.HasOne("DysonNetwork.Pass.Account.Account", "Account")
|
||||||
|
Reference in New Issue
Block a user