Merge pull request #14 from eurofurence/feature/artistsalley

Merging Artist Alley Feature branch to master
eurofurence · May 14, 2019 · b3421e8 · b3421e8
2 parents 3967adf + 3513e09
commit b3421e8
Show file tree

Hide file tree

Showing 20 changed files with 576 additions and 66 deletions.
diff --git a/src/Eurofurence.App.Common/ExtensionMethods/StringExtensions.cs b/src/Eurofurence.App.Common/ExtensionMethods/StringExtensions.cs
@@ -6,14 +6,16 @@ public static string EscapeMarkdown(this string input)
         {
             return input
                 .Replace("_", @"\_")
-                .Replace("*", @"\*");
+                .Replace("*", @"\*")
+                .Replace("`", @"\`");
         }
 
         public static string RemoveMarkdown(this string input)
         {
             return input
                 .Replace("_", "")
-                .Replace("*", "");
+                .Replace("*", "")
+                .Replace("`", "");
         }
 
         public static string UppercaseFirst(this string input)

diff --git a/src/Eurofurence.App.Domain.Model.MongoDb/ArtistsAlley/TableRegistrationRepository.cs b/src/Eurofurence.App.Domain.Model.MongoDb/ArtistsAlley/TableRegistrationRepository.cs
@@ -0,0 +1,15 @@
+using Eurofurence.App.Domain.Model.ArtistsAlley;
+using Eurofurence.App.Domain.Model.MongoDb.Repositories;
+using MongoDB.Driver;
+
+namespace Eurofurence.App.Domain.Model.MongoDb.ArtShow
+{
+    public class TableRegistrationRepository :
+        MongoDbEntityRepositoryBase<TableRegistrationRecord>
+    {
+        public TableRegistrationRepository(IMongoCollection<TableRegistrationRecord> collection)
+            : base(collection)
+        {
+        }
+    }
+}
diff --git a/src/Eurofurence.App.Domain.Model.MongoDb/DependencyResolution/AutofacModule.cs b/src/Eurofurence.App.Domain.Model.MongoDb/DependencyResolution/AutofacModule.cs
@@ -3,6 +3,7 @@
 using Eurofurence.App.Common.Abstractions;
 using Eurofurence.App.Domain.Model.Abstractions;
 using Eurofurence.App.Domain.Model.Announcements;
+using Eurofurence.App.Domain.Model.ArtistsAlley;
 using Eurofurence.App.Domain.Model.ArtShow;
 using Eurofurence.App.Domain.Model.Communication;
 using Eurofurence.App.Domain.Model.Dealers;
@@ -146,6 +147,8 @@ protected override void Load(ContainerBuilder builder)
             Register<ItemActivityRepository, IEntityRepository<ItemActivityRecord>, ItemActivityRecord>(builder,
                 collection => collection.Indexes.CreateOne(
                     Builders<ItemActivityRecord>.IndexKeys.Ascending(a => a.ImportHash)));
+
+            Register<TableRegistrationRepository, IEntityRepository<TableRegistrationRecord>, TableRegistrationRecord>(builder);
         }
     }
 }
diff --git a/src/Eurofurence.App.Domain.Model/ArtistsAlley/TableRegistrationRecord.cs b/src/Eurofurence.App.Domain.Model/ArtistsAlley/TableRegistrationRecord.cs
@@ -0,0 +1,57 @@
+using Eurofurence.App.Domain.Model.Fragments;
+using System;
+using System.Collections.Generic;
+
+namespace Eurofurence.App.Domain.Model.ArtistsAlley
+{
+    public class TableRegistrationRecord : EntityBase
+    {
+        public class StateChangeRecord
+        {
+            public DateTime ChangedDateTimeUtc{ get; set; }
+            public string ChangedByUid { get; set; }
+            public RegistrationStateEnum OldState { get; set; }
+            public RegistrationStateEnum NewState { get; set; }
+        }
+
+        public enum RegistrationStateEnum
+        {
+            Pending = 0,
+            Accepted = 1,
+            Published = 2,
+            Rejected = 3
+        }
+
+        public string OwnerUid { get; set; }
+
+        public string DisplayName { get; set; }
+
+        public string WebsiteUrl { get; set; }
+
+        public string ShortDescription { get; set; }
+
+        public ImageFragment Image { get; set; }
+
+        public RegistrationStateEnum State { get; set; }
+
+        public IList<StateChangeRecord> StateChangeLog { get; set; }
+
+        public TableRegistrationRecord()
+        {
+            this.StateChangeLog = new List<StateChangeRecord>();
+        }
+
+        public void ChangeState(RegistrationStateEnum newState, string uid)
+        {
+            StateChangeLog.Add(new StateChangeRecord()
+            {
+                ChangedByUid = uid,
+                ChangedDateTimeUtc = DateTime.UtcNow,
+                NewState = newState,
+                OldState = State
+            });
+
+            State = newState;
+        }
+    }
+}
diff --git a/src/Eurofurence.App.Domain.Model/Fragments/ImageFragment.cs b/src/Eurofurence.App.Domain.Model/Fragments/ImageFragment.cs
@@ -0,0 +1,28 @@
+using System.ComponentModel.DataAnnotations;
+using System.Runtime.Serialization;
+
+namespace Eurofurence.App.Domain.Model.Fragments
+{
+    [DataContract]
+    public class ImageFragment
+    {
+        [Required]
+        [DataMember]
+        public int Width { get; set; }
+
+        [Required]
+        [DataMember]
+        public int Height { get; set; }
+
+        [Required]
+        [DataMember]
+        public long SizeInBytes { get; set; }
+
+        [Required]
+        [DataMember]
+        public string MimeType { get; set; }
+
+        [Required]
+        public byte[] ImageBytes { get; set; }
+    }
+}
diff --git a/src/Eurofurence.App.Server.KestrelHost/appsettings.sample.json b/src/Eurofurence.App.Server.KestrelHost/appsettings.sample.json
@@ -2,10 +2,10 @@
   "global": {
     "conventionNumber": 23,
     "conventionIdentifier": "EF25",
-    "regSysAuthenticationEnabled":  0
+    "regSysAuthenticationEnabled": 0
   },
   "logLevel": 1,
-  "auditLog":  "/tmp/audit.log",
+  "auditLog": "/tmp/audit.log",
   "mongoDb": {
     "url": "mongodb://localhost:27017",
     "database": "app_dev"
@@ -38,6 +38,18 @@
     "logLevel": 1,
     "logFile": "/tmp/collect.log"
   },
+  "artistAlley": {
+    "telegram": {
+      "adminGroupChatId": "",
+      "announcementChannelId": ""
+    },
+    "twitter": {
+      "consumerKey": "",
+      "consumerSecret": "",
+      "accessToken": "",
+      "accessTokenSecret": ""
+    }
+  },
   "jobs": {
     "updateNews": {
       "secondsInterval": 60,

diff --git a/src/Eurofurence.App.Server.Services/Abstractions/ArtistsAlley/ArtistAlleyConfiguration.cs b/src/Eurofurence.App.Server.Services/Abstractions/ArtistsAlley/ArtistAlleyConfiguration.cs
@@ -0,0 +1,12 @@
+namespace Eurofurence.App.Server.Services.Abstractions.ArtistsAlley
+{
+    public class ArtistAlleyConfiguration
+    {
+        public string TelegramAdminGroupChatId { get; set; }
+        public string TelegramAnnouncementChannelId { get; set; }
+        public string TwitterConsumerKey { get; set; }
+        public string TwitterConsumerSecret { get; set; }
+        public string TwitterAccessToken { get; set; }
+        public string TwitterAccessTokenSecret { get; set; }
+    }
+}
diff --git a/src/Eurofurence.App.Server.Services/Abstractions/ArtistsAlley/ITableRegistrationService.cs b/src/Eurofurence.App.Server.Services/Abstractions/ArtistsAlley/ITableRegistrationService.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Eurofurence.App.Domain.Model.ArtistsAlley;
+
+namespace Eurofurence.App.Server.Services.Abstractions.ArtistsAlley
+{
+    public interface ITableRegistrationService
+    {
+        Task RegisterTableAsync(string uid, TableRegistrationRequest request);
+        Task<IEnumerable<TableRegistrationRecord>> GetRegistrations(TableRegistrationRecord.RegistrationStateEnum? state);
+
+        Task ApproveByIdAsync(Guid id, string operatorUid);
+        Task RejectByIdAsync(Guid id, string operatorUid);
+    }
+}
diff --git a/src/Eurofurence.App.Server.Services/Abstractions/ArtistsAlley/TableRegistrationRequest.cs b/src/Eurofurence.App.Server.Services/Abstractions/ArtistsAlley/TableRegistrationRequest.cs
@@ -0,0 +1,13 @@
+namespace Eurofurence.App.Server.Services.Abstractions.ArtistsAlley
+{
+    public class TableRegistrationRequest
+    {
+        public string DisplayName { get; set; }
+
+        public string WebsiteUrl { get; set; }
+
+        public string ShortDescription { get; set; }
+
+        public string ImageContent { get; set; }
+    }
+}
diff --git a/src/Eurofurence.App.Server.Services/Abstractions/Images/IImageService.cs b/src/Eurofurence.App.Server.Services/Abstractions/Images/IImageService.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using Eurofurence.App.Domain.Model.Fragments;
 using Eurofurence.App.Domain.Model.Images;
 
 namespace Eurofurence.App.Server.Services.Abstractions.Images
@@ -10,5 +11,7 @@ public interface IImageService : IEntityServiceOperations<ImageRecord>
         Task<Guid> InsertOrUpdateImageAsync(string internalReference, byte[] imageBytes);
         Task<byte[]> GetImageContentByIdAsync(Guid id);
         byte[] GeneratePlaceholderImage();
+        ImageFragment GenerateFragmentFromBytes(byte[] imageBytes);
+        ImageFragment EnforceMaximumDimensions(ImageFragment image, int width, int height);
     }
 }
diff --git a/src/Eurofurence.App.Server.Services/Abstractions/Telegram/ITelegramMessageSender.cs b/src/Eurofurence.App.Server.Services/Abstractions/Telegram/ITelegramMessageSender.cs
@@ -6,10 +6,12 @@ namespace Eurofurence.App.Server.Services.Abstractions.Telegram
     public interface ITelegramMessageSender
     {
         Task SendMarkdownMessageToChatAsync(string chatId, string message);
+        Task SendImageToChatAsync(string chatId, byte[] imageBytes, string message = "");
     }
 
     public interface ITelegramMessageBroker : ITelegramMessageSender
     {
         event Func<string, string, Task> OnSendMarkdownMessageToChatAsync;
+        event Func<string, byte[], string, Task> OnSendImageToChatAsync;
     }
 }