From 3a8426a0e6d1e6b569539916c37ad7cad81ced3b Mon Sep 17 00:00:00 2001 From: Sakura Akeno Isayeki Date: Sun, 1 Sep 2024 11:58:16 +0200 Subject: [PATCH 1/6] feat(Post): Add Customer Support Ticket ID property on Post entity This commit adds a new property called "CustomerSupportTicketId" to the Post model. This property is used to store the Customer Support ticket ID associated with a post. It can take a positive integer value up to 9 digits or be set as null if no ticket is associated. The purpose of this property is to allow WG staff to track and manage player reports. Implements database requirements for #165. --- WowsKarma.Api/Data/Models/Post.cs | 12 + .../20240901093435_AddCSTicketId.Designer.cs | 602 ++++++++++++++++++ .../20240901093435_AddCSTicketId.cs | 28 + .../ApiDb/ApiDbContextModelSnapshot.cs | 9 +- 4 files changed, 648 insertions(+), 3 deletions(-) create mode 100644 WowsKarma.Api/Migrations/20240901093435_AddCSTicketId.Designer.cs create mode 100644 WowsKarma.Api/Migrations/20240901093435_AddCSTicketId.cs diff --git a/WowsKarma.Api/Data/Models/Post.cs b/WowsKarma.Api/Data/Models/Post.cs index 1e80c98..f258b79 100644 --- a/WowsKarma.Api/Data/Models/Post.cs +++ b/WowsKarma.Api/Data/Models/Post.cs @@ -92,6 +92,18 @@ public sealed record Post : ITimestamped, IDisposable /// public bool ModLocked { get; set; } + /// + /// The Customer Support ticket ID associated with this post. + /// + /// + /// This is used by WG staff to track and manage player reports. + /// + /// + /// Set as if no ticket is associated. + /// When present, takes form as a positive integer, up to 9 digits. + /// + [Range(1, 999_999_999)] + public int? CustomerSupportTicketId { get; set; } /// public void Dispose() diff --git a/WowsKarma.Api/Migrations/20240901093435_AddCSTicketId.Designer.cs b/WowsKarma.Api/Migrations/20240901093435_AddCSTicketId.Designer.cs new file mode 100644 index 0000000..597dfce --- /dev/null +++ b/WowsKarma.Api/Migrations/20240901093435_AddCSTicketId.Designer.cs @@ -0,0 +1,602 @@ +// +using System; +using System.Collections.Generic; +using System.Text.Json; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Nodsoft.Wargaming.Api.Common.Data.Responses.Wows; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using WowsKarma.Api.Data; +using WowsKarma.Api.Data.Models.Replays; +using WowsKarma.Common.Models; + +#nullable disable + +namespace WowsKarma.Api.Migrations +{ + [DbContext(typeof(ApiDbContext))] + [Migration("20240901093435_AddCSTicketId")] + partial class AddCSTicketId + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "8.0.7") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "clan_role", new[] { "unknown", "commander", "executive_officer", "recruitment_officer", "commissioned_officer", "officer", "private" }); + NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "mod_action_type", new[] { "deletion", "update" }); + NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "notification_type", new[] { "unknown", "other", "post_added", "post_edited", "post_deleted", "post_mod_edited", "post_mod_deleted", "platform_ban" }); + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.Clan", b => + { + b.Property("Id") + .HasColumnType("bigint"); + + b.Property("CreatedAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasDefaultValueSql("NOW()"); + + b.Property("Description") + .IsRequired() + .HasColumnType("text"); + + b.Property("IsDisbanded") + .HasColumnType("boolean"); + + b.Property("LeagueColor") + .HasColumnType("bigint"); + + b.Property("MembersUpdatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.Property("Tag") + .IsRequired() + .HasColumnType("text"); + + b.Property("UpdatedAt") + .HasColumnType("timestamp with time zone"); + + b.HasKey("Id"); + + b.ToTable("Clans"); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.ClanMember", b => + { + b.Property("PlayerId") + .HasColumnType("bigint"); + + b.Property("ClanId") + .HasColumnType("bigint"); + + b.Property("JoinedAt") + .HasColumnType("date"); + + b.Property("LeftAt") + .HasColumnType("date"); + + b.Property("Role") + .HasColumnType("clan_role"); + + b.HasKey("PlayerId"); + + b.HasIndex("ClanId"); + + b.ToTable("ClanMembers"); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.Notifications.NotificationBase", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("AccountId") + .HasColumnType("bigint"); + + b.Property("AcknowledgedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("EmittedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("Type") + .HasColumnType("notification_type"); + + b.HasKey("Id"); + + b.HasIndex("AccountId"); + + b.ToTable("Notifications"); + + b.HasDiscriminator("Type").IsComplete(false).HasValue(NotificationType.Unknown); + + b.UseTphMappingStrategy(); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.PlatformBan", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("BannedUntil") + .HasColumnType("timestamp with time zone"); + + b.Property("CreatedAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasDefaultValueSql("NOW()"); + + b.Property("ModId") + .HasColumnType("bigint"); + + b.Property("Reason") + .IsRequired() + .HasColumnType("text"); + + b.Property("Reverted") + .HasColumnType("boolean"); + + b.Property("UpdatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("UserId") + .HasColumnType("bigint"); + + b.HasKey("Id"); + + b.HasIndex("ModId"); + + b.HasIndex("UserId"); + + b.ToTable("PlatformBans"); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.Player", b => + { + b.Property("Id") + .HasColumnType("bigint"); + + b.Property("CourtesyRating") + .HasColumnType("integer"); + + b.Property("CreatedAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasDefaultValueSql("NOW()"); + + b.Property("GameKarma") + .HasColumnType("integer"); + + b.Property("LastBattleTime") + .HasColumnType("timestamp with time zone"); + + b.Property("OptOutChanged") + .HasColumnType("timestamp with time zone"); + + b.Property("OptedOut") + .HasColumnType("boolean"); + + b.Property("PerformanceRating") + .HasColumnType("integer"); + + b.Property("PostsBanned") + .HasColumnType("boolean"); + + b.Property("SiteKarma") + .HasColumnType("integer"); + + b.Property("TeamplayRating") + .HasColumnType("integer"); + + b.Property("UpdatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("Username") + .IsRequired() + .HasColumnType("text"); + + b.Property("WgAccountCreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("WgHidden") + .HasColumnType("boolean"); + + b.HasKey("Id"); + + b.ToTable("Players"); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.Post", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("AuthorId") + .HasColumnType("bigint"); + + b.Property("Content") + .IsRequired() + .HasColumnType("text"); + + b.Property("CreatedAt") + .ValueGeneratedOnAdd() + .HasColumnType("timestamp with time zone") + .HasDefaultValueSql("NOW()"); + + b.Property("CustomerSupportTicketId") + .HasColumnType("integer"); + + b.Property("Flairs") + .HasColumnType("integer"); + + b.Property("ModLocked") + .HasColumnType("boolean"); + + b.Property("NegativeKarmaAble") + .HasColumnType("boolean"); + + b.Property("PlayerId") + .HasColumnType("bigint"); + + b.Property("ReadOnly") + .HasColumnType("boolean"); + + b.Property("ReplayId") + .HasColumnType("uuid"); + + b.Property("Title") + .IsRequired() + .HasColumnType("text"); + + b.Property("UpdatedAt") + .HasColumnType("timestamp with time zone"); + + b.HasKey("Id"); + + b.HasIndex("AuthorId"); + + b.HasIndex("PlayerId"); + + b.HasIndex("ReplayId") + .IsUnique(); + + b.ToTable("Posts"); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.PostModAction", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("ActionType") + .HasColumnType("mod_action_type"); + + b.Property("ModId") + .HasColumnType("bigint"); + + b.Property("PostId") + .HasColumnType("uuid"); + + b.Property("Reason") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("ModId"); + + b.HasIndex("PostId"); + + b.ToTable("PostModActions"); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.Replays.Replay", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("ArenaInfo") + .IsRequired() + .HasColumnType("jsonb"); + + b.Property("BlobName") + .IsRequired() + .HasColumnType("text"); + + b.Property>("ChatMessages") + .IsRequired() + .HasColumnType("jsonb"); + + b.Property("MinimapRendered") + .HasColumnType("boolean"); + + b.Property>("Players") + .IsRequired() + .HasColumnType("jsonb"); + + b.Property("PostId") + .HasColumnType("uuid"); + + b.HasKey("Id"); + + b.ToTable("Replays"); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.Notifications.PlatformBanNotification", b => + { + b.HasBaseType("WowsKarma.Api.Data.Models.Notifications.NotificationBase"); + + b.Property("BanId") + .HasColumnType("uuid"); + + b.HasIndex("BanId"); + + b.HasDiscriminator().HasValue(NotificationType.PlatformBan); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.Notifications.PostAddedNotification", b => + { + b.HasBaseType("WowsKarma.Api.Data.Models.Notifications.NotificationBase"); + + b.Property("PostId") + .ValueGeneratedOnUpdateSometimes() + .HasColumnType("uuid"); + + b.HasIndex("PostId"); + + b.HasDiscriminator().HasValue(NotificationType.PostAdded); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.Notifications.PostDeletedNotification", b => + { + b.HasBaseType("WowsKarma.Api.Data.Models.Notifications.NotificationBase"); + + b.Property("PostId") + .ValueGeneratedOnUpdateSometimes() + .HasColumnType("uuid"); + + b.HasIndex("PostId"); + + b.HasDiscriminator().HasValue(NotificationType.PostDeleted); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.Notifications.PostEditedNotification", b => + { + b.HasBaseType("WowsKarma.Api.Data.Models.Notifications.NotificationBase"); + + b.Property("PostId") + .ValueGeneratedOnUpdateSometimes() + .HasColumnType("uuid"); + + b.HasIndex("PostId"); + + b.HasDiscriminator().HasValue(NotificationType.PostEdited); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.Notifications.PostModDeletedNotification", b => + { + b.HasBaseType("WowsKarma.Api.Data.Models.Notifications.NotificationBase"); + + b.Property("ModActionId") + .HasColumnType("uuid"); + + b.HasIndex("ModActionId"); + + b.HasDiscriminator().HasValue(NotificationType.PostModDeleted); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.Notifications.PostModEditedNotification", b => + { + b.HasBaseType("WowsKarma.Api.Data.Models.Notifications.NotificationBase"); + + b.Property("ModActionId") + .HasColumnType("uuid"); + + b.HasIndex("ModActionId"); + + b.ToTable("Notifications", t => + { + t.Property("ModActionId") + .HasColumnName("PostModEditedNotification_ModActionId"); + }); + + b.HasDiscriminator().HasValue(NotificationType.PostModEdited); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.ClanMember", b => + { + b.HasOne("WowsKarma.Api.Data.Models.Clan", "Clan") + .WithMany("Members") + .HasForeignKey("ClanId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("WowsKarma.Api.Data.Models.Player", "Player") + .WithOne("ClanMember") + .HasForeignKey("WowsKarma.Api.Data.Models.ClanMember", "PlayerId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Clan"); + + b.Navigation("Player"); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.Notifications.NotificationBase", b => + { + b.HasOne("WowsKarma.Api.Data.Models.Player", "Account") + .WithMany() + .HasForeignKey("AccountId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Account"); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.PlatformBan", b => + { + b.HasOne("WowsKarma.Api.Data.Models.Player", "Mod") + .WithMany() + .HasForeignKey("ModId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("WowsKarma.Api.Data.Models.Player", "User") + .WithMany("PlatformBans") + .HasForeignKey("UserId") + .OnDelete(DeleteBehavior.Restrict); + + b.Navigation("Mod"); + + b.Navigation("User"); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.Post", b => + { + b.HasOne("WowsKarma.Api.Data.Models.Player", "Author") + .WithMany("PostsSent") + .HasForeignKey("AuthorId") + .OnDelete(DeleteBehavior.Restrict); + + b.HasOne("WowsKarma.Api.Data.Models.Player", "Player") + .WithMany("PostsReceived") + .HasForeignKey("PlayerId") + .OnDelete(DeleteBehavior.Restrict); + + b.HasOne("WowsKarma.Api.Data.Models.Replays.Replay", "Replay") + .WithOne("Post") + .HasForeignKey("WowsKarma.Api.Data.Models.Post", "ReplayId"); + + b.Navigation("Author"); + + b.Navigation("Player"); + + b.Navigation("Replay"); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.PostModAction", b => + { + b.HasOne("WowsKarma.Api.Data.Models.Player", "Mod") + .WithMany() + .HasForeignKey("ModId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("WowsKarma.Api.Data.Models.Post", "Post") + .WithMany() + .HasForeignKey("PostId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Mod"); + + b.Navigation("Post"); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.Notifications.PlatformBanNotification", b => + { + b.HasOne("WowsKarma.Api.Data.Models.PlatformBan", "Ban") + .WithMany() + .HasForeignKey("BanId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Ban"); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.Notifications.PostAddedNotification", b => + { + b.HasOne("WowsKarma.Api.Data.Models.Post", "Post") + .WithMany() + .HasForeignKey("PostId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Post"); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.Notifications.PostDeletedNotification", b => + { + b.HasOne("WowsKarma.Api.Data.Models.Post", "Post") + .WithMany() + .HasForeignKey("PostId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Post"); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.Notifications.PostEditedNotification", b => + { + b.HasOne("WowsKarma.Api.Data.Models.Post", "Post") + .WithMany() + .HasForeignKey("PostId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Post"); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.Notifications.PostModDeletedNotification", b => + { + b.HasOne("WowsKarma.Api.Data.Models.PostModAction", "ModAction") + .WithMany() + .HasForeignKey("ModActionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ModAction"); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.Notifications.PostModEditedNotification", b => + { + b.HasOne("WowsKarma.Api.Data.Models.PostModAction", "ModAction") + .WithMany() + .HasForeignKey("ModActionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("ModAction"); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.Clan", b => + { + b.Navigation("Members"); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.Player", b => + { + b.Navigation("ClanMember"); + + b.Navigation("PlatformBans"); + + b.Navigation("PostsReceived"); + + b.Navigation("PostsSent"); + }); + + modelBuilder.Entity("WowsKarma.Api.Data.Models.Replays.Replay", b => + { + b.Navigation("Post") + .IsRequired(); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/WowsKarma.Api/Migrations/20240901093435_AddCSTicketId.cs b/WowsKarma.Api/Migrations/20240901093435_AddCSTicketId.cs new file mode 100644 index 0000000..1fe46b1 --- /dev/null +++ b/WowsKarma.Api/Migrations/20240901093435_AddCSTicketId.cs @@ -0,0 +1,28 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace WowsKarma.Api.Migrations +{ + /// + public partial class AddCSTicketId : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "CustomerSupportTicketId", + table: "Posts", + type: "integer", + nullable: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "CustomerSupportTicketId", + table: "Posts"); + } + } +} diff --git a/WowsKarma.Api/Migrations/ApiDb/ApiDbContextModelSnapshot.cs b/WowsKarma.Api/Migrations/ApiDb/ApiDbContextModelSnapshot.cs index 87968ea..cc557df 100644 --- a/WowsKarma.Api/Migrations/ApiDb/ApiDbContextModelSnapshot.cs +++ b/WowsKarma.Api/Migrations/ApiDb/ApiDbContextModelSnapshot.cs @@ -1,11 +1,11 @@ // using System; using System.Collections.Generic; +using System.Text.Json; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Nodsoft.Wargaming.Api.Common.Data.Responses.Wows; -using Nodsoft.WowsReplaysUnpack.Core.Models; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; using WowsKarma.Api.Data; using WowsKarma.Api.Data.Models.Replays; @@ -22,7 +22,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "8.0.1") + .HasAnnotation("ProductVersion", "8.0.7") .HasAnnotation("Relational:MaxIdentifierLength", 63); NpgsqlModelBuilderExtensions.HasPostgresEnum(modelBuilder, "clan_role", new[] { "unknown", "commander", "executive_officer", "recruitment_officer", "commissioned_officer", "officer", "private" }); @@ -234,6 +234,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("timestamp with time zone") .HasDefaultValueSql("NOW()"); + b.Property("CustomerSupportTicketId") + .HasColumnType("integer"); + b.Property("Flairs") .HasColumnType("integer"); @@ -305,7 +308,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .ValueGeneratedOnAdd() .HasColumnType("uuid"); - b.Property("ArenaInfo") + b.Property("ArenaInfo") .IsRequired() .HasColumnType("jsonb"); From 495032cc7d0fa6d8d7390bb9c513f971a054bb76 Mon Sep 17 00:00:00 2001 From: Sakura Akeno Isayeki Date: Sun, 1 Sep 2024 12:03:49 +0200 Subject: [PATCH 2/6] feat(dto): Add SupportTicketStatus field to PlayerPostDTO + Mappings This commit adds a new field, SupportTicketStatus, to the PlayerPostDTO class in the WowsKarma.Common project. The SupportTicketStatus field represents the status of the Customer Support ticket associated with the post when applicable. Additionally, mappings are configured in the Conversions utility class to map the CustomerSupportTicketId property of Post to TicketId property of SupportTicketStatus in PlayerPostDTO. This allows for seamless conversion between Post and PlayerPostDTO objects while preserving the relevant information about Customer Support tickets. --- WowsKarma.Api/Utilities/Conversions.cs | 16 +++++++++--- WowsKarma.Common/Models/DTOs/PlayerPostDTO.cs | 25 +++++++++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/WowsKarma.Api/Utilities/Conversions.cs b/WowsKarma.Api/Utilities/Conversions.cs index edf1928..c69d72d 100644 --- a/WowsKarma.Api/Utilities/Conversions.cs +++ b/WowsKarma.Api/Utilities/Conversions.cs @@ -15,12 +15,17 @@ public static class Conversions public static void ConfigureMapping() { TypeAdapterConfig.GlobalSettings.Compiler = exp => exp.CompileWithDebugInfo(); - + TypeAdapterConfig .NewConfig() .IgnoreNullValues(true) .Ignore(dest => dest.Author) - .Ignore(dest => dest.Player); + .Ignore(dest => dest.Player) + .Map( + dest => dest.CustomerSupportTicketId, + src => src.SupportTicketStatus.TicketId, + srcCond => srcCond.SupportTicketStatus.TicketId != null + ); TypeAdapterConfig .NewConfig() @@ -34,7 +39,12 @@ public static void ConfigureMapping() : ReplayState.Processing ) .Map(dest => dest.Author.Clan, src => src.Author.ClanMember.Clan) - .Map(dest => dest.Player.Clan, src => src.Player.ClanMember.Clan); + .Map(dest => dest.Player.Clan, src => src.Player.ClanMember.Clan) + .Map(dest => dest.SupportTicketStatus, src => new PlayerPostDTO.CustomerSupportStatus + { + HasTicket = src.CustomerSupportTicketId != null, + TicketId = src.CustomerSupportTicketId + }); TypeAdapterConfig .NewConfig() diff --git a/WowsKarma.Common/Models/DTOs/PlayerPostDTO.cs b/WowsKarma.Common/Models/DTOs/PlayerPostDTO.cs index 87693cd..489f5c8 100644 --- a/WowsKarma.Common/Models/DTOs/PlayerPostDTO.cs +++ b/WowsKarma.Common/Models/DTOs/PlayerPostDTO.cs @@ -26,4 +26,29 @@ public record PlayerPostDTO // Computed by DB Engine (hopefully) public DateTimeOffset? CreatedAt { get; init; } public DateTimeOffset? UpdatedAt { get; init; } + + /// + /// The status of the Customer Support ticket associated with the post when applicable. + /// + public CustomerSupportStatus SupportTicketStatus { get; init; } + + /// + /// Defines the status of the Customer Support ticket associated with the post when applicable. + /// + public struct CustomerSupportStatus + { + /// + /// Whether the post has an associated Customer Support ticket. + /// + public bool HasTicket { get; init; } + + /// + /// The Customer Support ticket ID associated with this post. + /// + /// + /// This is only available when is , + /// and only visible to the post's author, platform staff, and Wargaming staff. + /// + public int? TicketId { get; init; } + } } From 2d228ab663bb916de5f6c44431a28d2de9f27081 Mon Sep 17 00:00:00 2001 From: Sakura Akeno Isayeki Date: Sun, 1 Sep 2024 15:10:30 +0200 Subject: [PATCH 3/6] feat(post): Add support for CS ticket ID field in post editor - Added a new property `supportTicketStatus` to the `PlayerPostEditorDto` interface and implemented it in the `PostEditorComponent` - Created a new component `CsTicketIdHelpComponent` to display information about Customer Support tickets - Added a new HTML template file for the `CsTicketIdHelpComponent` - Updated the HTML template of the `PostEditorComponent` to include a CS ticket ID field when certain conditions are met - Updated the CSS styles of the `SeedTokenChangeComponent` (removed) - Updated the TypeScript code of the `SeedTokenChangeComponent` (removed) - Updated the HTML template of the `PostComponent` to display CS ticket related icons and tooltips Implements frontend requirements for #165. --- .../services/api/models/player-post-dto.ts | 4 + .../cs-ticket-id-help.component.html | 63 +++++++++ .../cs-ticket-id-help.component.ts | 56 ++++++++ .../post-editor/post-editor.component.html | 39 ++++-- .../post-editor/post-editor.component.ts | 16 ++- .../seed-token-change.component.scss | 0 .../seed-token-change.component.ts | 1 - .../src/app/shared/post/post.component.html | 128 +++++++++--------- 8 files changed, 234 insertions(+), 73 deletions(-) create mode 100644 wowskarma.app/src/app/shared/modals/cs-ticket-id-help/cs-ticket-id-help.component.html create mode 100644 wowskarma.app/src/app/shared/modals/cs-ticket-id-help/cs-ticket-id-help.component.ts delete mode 100644 wowskarma.app/src/app/shared/modals/seed-token-change/seed-token-change.component.scss diff --git a/wowskarma.app/src/app/services/api/models/player-post-dto.ts b/wowskarma.app/src/app/services/api/models/player-post-dto.ts index f623c8e..10615fc 100644 --- a/wowskarma.app/src/app/services/api/models/player-post-dto.ts +++ b/wowskarma.app/src/app/services/api/models/player-post-dto.ts @@ -20,6 +20,10 @@ export interface PlayerPostDto { replayState?: ReplayState title?: null | string; updatedAt?: null | string; + supportTicketStatus?: { + hasTicket: boolean; + ticketId: number | null; + } } enum ReplayState { diff --git a/wowskarma.app/src/app/shared/modals/cs-ticket-id-help/cs-ticket-id-help.component.html b/wowskarma.app/src/app/shared/modals/cs-ticket-id-help/cs-ticket-id-help.component.html new file mode 100644 index 0000000..5264d4e --- /dev/null +++ b/wowskarma.app/src/app/shared/modals/cs-ticket-id-help/cs-ticket-id-help.component.html @@ -0,0 +1,63 @@ +
+

Customer Support Tickets

+ +
+ +
+
+ +
+
+

What is a Customer Support Ticket ?

+ +

+ Wargaming's Customer Support (aka CS or Player Support) helps players with any issue related to the game. + Submitting a ticket to CS is the best way to get help with your issue, may it be a bug, a technical problem, or a report. +

+
+ +
+

How is this related to WOWS Karma ?

+ +

+ WOWS Karma is a community-based platform that is separate from the Customer Support system. + While endorsed, we are not affiliated to Wargaming. This means that our posts aren't systematically sent to WG for reporting. +

+ +

+ While CS does occasionally receive some of our posts through tickets, + insight from Wargaming shows that this is only a minuscule percentage of the posts currently on our platform. +

+
+ +
+

Why should I submit a ticket to Customer Support ?

+ +

+ WOWS Karma has no power whatsoever on negative events, and our staff is unable to take action on players. + The only party able to effectively take action on players is Wargaming's Customer Support. +

+ +

+ If you encounter a player that is acting negatively, submitting a ticket to CS is the best way to get them sanctioned. + This is why, if you feel that the player you're posting on has broken the rules, we strongly encourage you to submit a ticket right away. +

+
+ +
+

How do I submit a ticket to Customer Support ?

+

+ To submit a ticket to WG's {{ region() }} Customer Support, you can follow these links depending on your issue : +

+ + + +

+ Once reported, then come back here with your Ticket ID. + This will help us, Wargaming, and others know that the affected user has already been reported for a given issue. +

+
+
diff --git a/wowskarma.app/src/app/shared/modals/cs-ticket-id-help/cs-ticket-id-help.component.ts b/wowskarma.app/src/app/shared/modals/cs-ticket-id-help/cs-ticket-id-help.component.ts new file mode 100644 index 0000000..79cb23e --- /dev/null +++ b/wowskarma.app/src/app/shared/modals/cs-ticket-id-help/cs-ticket-id-help.component.ts @@ -0,0 +1,56 @@ +import { ChangeDetectionStrategy, Component, computed, inject, Input } from '@angular/core'; +import { NgbModal, NgbModalRef } from "@ng-bootstrap/ng-bootstrap"; +import { AuthService } from "../../../services/api/services/auth.service"; +import { AppConfigService } from "../../../services/app-config.service"; + +@Component({ + selector: 'app-cs-ticket-id', + standalone: true, + imports: [], + templateUrl: './cs-ticket-id-help.component.html', + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class CsTicketIdHelpComponent { + @Input() modal!: NgbModalRef; + + appConfig = inject(AppConfigService); + + region = computed(() => this.appConfig.currentRegion); + + csLinks = computed<[string, string]>(() => { + /* + * In order: + * - Gameplay / Collusions + * - Chat Issues + * + * See: https://github.com/SakuraIsayeki/WOWS-Karma/issues/165 + */ + + if (this.region() === 'EU') { + return [ + 'https://eu.wargaming.net/support/en/products/wows/help/29948/29949/29955/29957/', + 'https://eu.wargaming.net/support/en/products/wows/help/29948/29949/29951/29952/' + ]; + } else if (this.region() === 'NA') { + return [ + 'https://na.wargaming.net/support/en/products/wows/help/31336/31337/31338/31339/', + 'https://na.wargaming.net/support/en/products/wows/help/31336/31337/31345/' + ]; + } else if (this.region() === 'SEA') { + return [ + "https://asia.wargaming.net/support/en/products/wows/help/28687/28688/28689/", + "https://asia.wargaming.net/support/en/products/wows/help/28687/28688/28694/" + ]; + } + + return ['', '']; + }) + + constructor() { + } + + static OpenModal(modalService: NgbModal) { + const modalRef = modalService.open(CsTicketIdHelpComponent, { size: "lg" }); + modalRef.componentInstance.modal = modalRef; + } +} diff --git a/wowskarma.app/src/app/shared/modals/post-editor/post-editor.component.html b/wowskarma.app/src/app/shared/modals/post-editor/post-editor.component.html index dc658a7..54bcc24 100644 --- a/wowskarma.app/src/app/shared/modals/post-editor/post-editor.component.html +++ b/wowskarma.app/src/app/shared/modals/post-editor/post-editor.component.html @@ -69,20 +69,41 @@
{{group.label}}
-
-

Replay File

+
+
+

Replay File

- + -
- +
+ +
+ + + @if (flairGroups.length > 1 && (flairGroups[1].control.value === false || flairGroups[2].control.value === false)) { +
+
+ + + (optional) + + + + +
+ + +
+ }
- -
diff --git a/wowskarma.app/src/app/shared/modals/post-editor/post-editor.component.ts b/wowskarma.app/src/app/shared/modals/post-editor/post-editor.component.ts index 29a3306..d8f5590 100644 --- a/wowskarma.app/src/app/shared/modals/post-editor/post-editor.component.ts +++ b/wowskarma.app/src/app/shared/modals/post-editor/post-editor.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, HostListener, Input } from "@angular/core"; +import { ChangeDetectionStrategy, Component, HostListener, inject, Input } from "@angular/core"; import { FormBuilder, FormControl, FormGroup, Validators } from "@angular/forms"; import { NgbModal, NgbModalRef } from "@ng-bootstrap/ng-bootstrap"; import { AccountClanListingDto } from "src/app/services/api/models/account-clan-listing-dto"; @@ -9,6 +9,7 @@ import { PostService } from "src/app/services/api/services/post.service"; import { markTouchedDirtyAndValidate, TypedFormControls, TypedFormGroup } from "src/app/services/helpers"; import { parseFlairsEnum, toEnum } from "src/app/services/metricsHelpers"; import * as ReplayValidators from "../../validation/replay-validators"; +import { CsTicketIdHelpComponent } from "../cs-ticket-id-help/cs-ticket-id-help.component"; @Component({ selector: "post-editor", @@ -19,6 +20,8 @@ export class PostEditorComponent { @Input() post!: PlayerPostEditorDto; @Input() modal!: NgbModalRef; + modalService = inject(NgbModal); + form = new FormBuilder().nonNullable.group({ id: "", title: ["", [Validators.required, Validators.minLength(5), Validators.maxLength(60)]], @@ -30,7 +33,11 @@ export class PostEditorComponent { }), replayFile: [null as File | null, [ReplayValidators.requireReplay]], guidelinesAccepted: [false, Validators.requiredTrue], - modReason: "" + modReason: "", + supportTicketStatus: new FormBuilder().group({ + hasTicket: [false], + ticketId: [null as number | null, Validators.maxLength(9)], + }) }) protected readonly flairsOptions = [ @@ -130,6 +137,10 @@ export class PostEditorComponent { console.debug("Submitting post", this.post); } + + openCsTicketHelp() { + CsTicketIdHelpComponent.OpenModal(this.modalService); + } } export class PlayerPostEditorDto implements PlayerPostDto { @@ -149,6 +160,7 @@ export class PlayerPostEditorDto implements PlayerPostDto { replayFile: File | null = null; guidelinesAccepted: boolean = false; + supportTicketStatus: { hasTicket: boolean, ticketId: number | null } = { hasTicket: false, ticketId: null }; static fromDto(dto: PlayerPostDto): PlayerPostEditorDto { let p = dto as PlayerPostEditorDto; diff --git a/wowskarma.app/src/app/shared/modals/seed-token-change/seed-token-change.component.scss b/wowskarma.app/src/app/shared/modals/seed-token-change/seed-token-change.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/wowskarma.app/src/app/shared/modals/seed-token-change/seed-token-change.component.ts b/wowskarma.app/src/app/shared/modals/seed-token-change/seed-token-change.component.ts index 16ee765..082637b 100644 --- a/wowskarma.app/src/app/shared/modals/seed-token-change/seed-token-change.component.ts +++ b/wowskarma.app/src/app/shared/modals/seed-token-change/seed-token-change.component.ts @@ -7,7 +7,6 @@ import { AppConfigService } from "../../../services/app-config.service"; @Component({ selector: "modal-seed-token-change", templateUrl: "./seed-token-change.component.html", - styleUrls: ["./seed-token-change.component.scss"], changeDetection: ChangeDetectionStrategy.OnPush, }) export class SeedTokenChangeComponent { diff --git a/wowskarma.app/src/app/shared/post/post.component.html b/wowskarma.app/src/app/shared/post/post.component.html index 0d2502c..7ddedb6 100644 --- a/wowskarma.app/src/app/shared/post/post.component.html +++ b/wowskarma.app/src/app/shared/post/post.component.html @@ -1,78 +1,84 @@
-

- - > - -

+

+ + > + +

-
-
-
{{ p.title }}
-
- -
- -
+
+
+
{{ p.title }}
+
-
-
-
- -
+
+ +
-
- - +
+
+
+ +
- @switch (p.replayState) { - @case (2) { - - - - } +
+ + - @case (1) { - - - - } + @switch (p.replayState) { + @case (2) { + + + + } + @case (1) { + + + + } + @case (0) { + + } + } - @case (0) { - - } - } + @if (p.supportTicketStatus?.hasTicket) { + @if (p.supportTicketStatus?.ticketId) { + + } @else { + + } + } - - - -
-
+ + +
+
+
-
-

- - From - - +

+

+ @if (postDisplayType() === 'received') { + From + } - - To - - + @if (postDisplayType() === 'sent') { + To + } - {{ p.createdAt | date:'medium' }} -

+ {{ p.createdAt | date:'medium' }} +

-
- - +
+
+ + +
-
- - -
-
+
+ +
+
+
From 706c47cc66c0edc79d6af37311f48dbd4260dba0 Mon Sep 17 00:00:00 2001 From: Sakura Akeno Isayeki Date: Sun, 1 Sep 2024 15:17:18 +0200 Subject: [PATCH 4/6] fix(post): Fix missing CS Ticket ID attribution The code changes in this commit fix an issue where the support ticket ID was not being attributed correctly to a post. The commit adds logic to retrieve the ticket ID from the form controls and assigns it to the post's supportTicketStatus property. This ensures that the post is associated with the correct support ticket. --- WowsKarma.Api/Services/Posts/PostService.cs | 1 + WowsKarma.Common/Models/DTOs/PlayerPostDTO.cs | 2 +- .../src/app/shared/modals/post-editor/post-editor.component.ts | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/WowsKarma.Api/Services/Posts/PostService.cs b/WowsKarma.Api/Services/Posts/PostService.cs index b35e6b4..f6ae235 100644 --- a/WowsKarma.Api/Services/Posts/PostService.cs +++ b/WowsKarma.Api/Services/Posts/PostService.cs @@ -177,6 +177,7 @@ public async Task EditPostAsync(Guid id, PlayerPostDTO edited, bool modEditLock current.Flairs = edited.Flairs; current.UpdatedAt = DateTimeOffset.UtcNow; // Forcing UpdatedAt refresh current.ReadOnly = current.ReadOnly || modEditLock; + current.CustomerSupportTicketId = edited.SupportTicketStatus.TicketId; KarmaService.UpdatePlayerKarma(player, current.ParsedFlairs, previousFlairs, current.NegativeKarmaAble); KarmaService.UpdatePlayerRatings(player, current.ParsedFlairs, previousFlairs); diff --git a/WowsKarma.Common/Models/DTOs/PlayerPostDTO.cs b/WowsKarma.Common/Models/DTOs/PlayerPostDTO.cs index 489f5c8..5c337f8 100644 --- a/WowsKarma.Common/Models/DTOs/PlayerPostDTO.cs +++ b/WowsKarma.Common/Models/DTOs/PlayerPostDTO.cs @@ -35,7 +35,7 @@ public record PlayerPostDTO /// /// Defines the status of the Customer Support ticket associated with the post when applicable. /// - public struct CustomerSupportStatus + public readonly struct CustomerSupportStatus { /// /// Whether the post has an associated Customer Support ticket. diff --git a/wowskarma.app/src/app/shared/modals/post-editor/post-editor.component.ts b/wowskarma.app/src/app/shared/modals/post-editor/post-editor.component.ts index d8f5590..ea7067a 100644 --- a/wowskarma.app/src/app/shared/modals/post-editor/post-editor.component.ts +++ b/wowskarma.app/src/app/shared/modals/post-editor/post-editor.component.ts @@ -106,6 +106,9 @@ export class PostEditorComponent { this.post.replayFile = this.form.controls.replayFile.value; } + const ticketId = this.form.controls.supportTicketStatus.controls.ticketId.value; + this.post.supportTicketStatus = { hasTicket: !!ticketId, ticketId }; + if (create) { // Create the body as a form data From a69cb3717f5571eaa12c585a22c207b15b48a035 Mon Sep 17 00:00:00 2001 From: Sakura Akeno Isayeki Date: Sun, 1 Sep 2024 15:29:35 +0200 Subject: [PATCH 5/6] feat(api/discord): Add CS ticket ID field to embed This commit adds a new field "CS Ticket ID" to the Discord embed in the PostWebhookService class. The field displays the support ticket ID if it exists in the post's SupportTicketStatus. This change enhances the information displayed in the Discord webhook message. --- WowsKarma.Api/Services/Discord/PostWebhookService.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/WowsKarma.Api/Services/Discord/PostWebhookService.cs b/WowsKarma.Api/Services/Discord/PostWebhookService.cs index 2c2388d..03d2c22 100644 --- a/WowsKarma.Api/Services/Discord/PostWebhookService.cs +++ b/WowsKarma.Api/Services/Discord/PostWebhookService.cs @@ -86,6 +86,11 @@ private static DiscordEmbedBuilder AddPostContent(DiscordEmbedBuilder embed, Pla embed.AddField("Teamplay", GetFlairValueString(parsedFlairs?.Teamplay), true); embed.AddField("Courtesy", GetFlairValueString(parsedFlairs?.Courtesy), true); + if (post.SupportTicketStatus.HasTicket) + { + embed.AddField("CS Ticket ID", $"`{post.SupportTicketStatus.TicketId:D}`"); + } + return embed; } } \ No newline at end of file From b84c484ea4c0ee9a9890c2c3cc6caae120215f8c Mon Sep 17 00:00:00 2001 From: Sakura Akeno Isayeki Date: Sun, 1 Sep 2024 15:46:46 +0200 Subject: [PATCH 6/6] feat(post): add conditional CS Ticket ID display - Updated the HTML template of the post component to improve the display of support tickets. - Added a condition in the HTML template to show the support ticket ID only if the user is the owner or privileged. - Changed the tooltip text from "Reported to CS" to "Reported to Customer Support". - Modified the TypeScript file of the post component to include a computed property `isOwnerOrPrivileged` that checks if the user is the owner or has privileged roles. This commit improves how support tickets are displayed and provides more accurate information for users. --- wowskarma.app/src/app/shared/post/post.component.html | 4 ++-- wowskarma.app/src/app/shared/post/post.component.ts | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/wowskarma.app/src/app/shared/post/post.component.html b/wowskarma.app/src/app/shared/post/post.component.html index 7ddedb6..f1d5ceb 100644 --- a/wowskarma.app/src/app/shared/post/post.component.html +++ b/wowskarma.app/src/app/shared/post/post.component.html @@ -41,10 +41,10 @@
{{ p.title }}
} @if (p.supportTicketStatus?.hasTicket) { - @if (p.supportTicketStatus?.ticketId) { + @if (p.supportTicketStatus?.ticketId && isOwnerOrPrivileged()) { } @else { - + } } diff --git a/wowskarma.app/src/app/shared/post/post.component.ts b/wowskarma.app/src/app/shared/post/post.component.ts index 7674e79..8a9cd04 100644 --- a/wowskarma.app/src/app/shared/post/post.component.ts +++ b/wowskarma.app/src/app/shared/post/post.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, input } from "@angular/core"; +import { ChangeDetectionStrategy, Component, computed, input } from "@angular/core"; import { NgbModal } from "@ng-bootstrap/ng-bootstrap"; import { PostModEditorComponent } from 'src/app/shared/modals/post-mod-edit/post-mod-editor.component'; import { PlayerPostDto } from "../../services/api/models/player-post-dto"; @@ -16,6 +16,12 @@ import { PostModDeleteComponent } from "../modals/post-mod-delete/post-mod-delet export class PostComponent { public post = input(); public postDisplayType = input.required<"neutral" | "received" | "sent">(); + public isOwnerOrPrivileged = computed(() => + this.authService.userInfo$.value?.id === this.post()?.author?.id + || this.authService.userInfo$.value?.roles?.includes("mod") + || this.authService.userInfo$.value?.roles?.includes("admin") + || this.authService.userInfo$.value?.roles?.includes("wg") + ); constructor(public authService: AuthService, private modalService: NgbModal) { }