From 027a3fd0c43992b2a67001509ceadb97466a4c0a Mon Sep 17 00:00:00 2001 From: sysadmin Date: Wed, 27 Aug 2025 19:18:46 +0100 Subject: [PATCH] Implement bidirectional customer conversations with customer-based grouping and order tagging --- .../Extensions/ServiceCollectionExtensions.cs | 15 ++ LittleShop.Client/LittleShopClient.cs | 6 +- LittleShop.Client/Models/CustomerMessage.cs | 24 +++ LittleShop.Client/Services/IMessageService.cs | 11 ++ LittleShop.Client/Services/MessageService.cs | 87 ++++++++++ .../Admin/Controllers/MessagesController.cs | 72 +++++++++ .../Admin/Views/Messages/Customer.cshtml | 149 ++++++++++++++++++ .../Areas/Admin/Views/Messages/Index.cshtml | 86 ++++++++++ .../Areas/Admin/Views/Orders/Details.cshtml | 7 +- .../Areas/Admin/Views/Shared/_Layout.cshtml | 5 + .../Controllers/BotMessagesController.cs | 50 ++++++ LittleShop/Services/CustomerMessageService.cs | 68 ++++---- .../Services/ICustomerMessageService.cs | 1 + LittleShop/littleshop.db-shm | Bin 32768 -> 32768 bytes LittleShop/littleshop.db-wal | Bin 107152 -> 321392 bytes TeleBot/TeleBot/Handlers/CallbackHandler.cs | 39 +++++ TeleBot/TeleBot/Handlers/CommandHandler.cs | 33 ++++ TeleBot/TeleBot/Handlers/MessageHandler.cs | 58 ++++++- TeleBot/TeleBot/Models/UserSession.cs | 1 + TeleBot/TeleBot/Program.cs | 5 + TeleBot/TeleBot/Services/LittleShopService.cs | 96 +++++++---- .../Services/MessageDeliveryService.cs | 24 ++- TeleBot/TeleBot/TelegramBotService.cs | 11 +- TeleBot/TeleBot/UI/MenuBuilder.cs | 14 ++ TeleBot/TeleBot/UI/MessageFormatter.cs | 2 + 25 files changed, 794 insertions(+), 70 deletions(-) create mode 100644 LittleShop.Client/Models/CustomerMessage.cs create mode 100644 LittleShop.Client/Services/IMessageService.cs create mode 100644 LittleShop.Client/Services/MessageService.cs create mode 100644 LittleShop/Areas/Admin/Controllers/MessagesController.cs create mode 100644 LittleShop/Areas/Admin/Views/Messages/Customer.cshtml create mode 100644 LittleShop/Areas/Admin/Views/Messages/Index.cshtml diff --git a/LittleShop.Client/Extensions/ServiceCollectionExtensions.cs b/LittleShop.Client/Extensions/ServiceCollectionExtensions.cs index 86f5936..b4c49a0 100644 --- a/LittleShop.Client/Extensions/ServiceCollectionExtensions.cs +++ b/LittleShop.Client/Extensions/ServiceCollectionExtensions.cs @@ -87,6 +87,21 @@ public static class ServiceCollectionExtensions var options = serviceProvider.GetRequiredService>().Value; return new RetryPolicyHandler(logger, options.MaxRetryAttempts); }); + + services.AddHttpClient((serviceProvider, client) => + { + var options = serviceProvider.GetRequiredService>().Value; + client.BaseAddress = new Uri(options.BaseUrl); + client.Timeout = TimeSpan.FromSeconds(options.TimeoutSeconds); + client.DefaultRequestHeaders.Add("Accept", "application/json"); + }) + .AddHttpMessageHandler() + .AddHttpMessageHandler(serviceProvider => + { + var logger = serviceProvider.GetRequiredService>(); + var options = serviceProvider.GetRequiredService>().Value; + return new RetryPolicyHandler(logger, options.MaxRetryAttempts); + }); // Register the main client services.AddScoped(); diff --git a/LittleShop.Client/LittleShopClient.cs b/LittleShop.Client/LittleShopClient.cs index 61503e3..0f17fc8 100644 --- a/LittleShop.Client/LittleShopClient.cs +++ b/LittleShop.Client/LittleShopClient.cs @@ -10,6 +10,7 @@ public interface ILittleShopClient ICatalogService Catalog { get; } IOrderService Orders { get; } ICustomerService Customers { get; } + IMessageService Messages { get; } } public class LittleShopClient : ILittleShopClient @@ -18,16 +19,19 @@ public class LittleShopClient : ILittleShopClient public ICatalogService Catalog { get; } public IOrderService Orders { get; } public ICustomerService Customers { get; } + public IMessageService Messages { get; } public LittleShopClient( IAuthenticationService authenticationService, ICatalogService catalogService, IOrderService orderService, - ICustomerService customerService) + ICustomerService customerService, + IMessageService messageService) { Authentication = authenticationService; Catalog = catalogService; Orders = orderService; Customers = customerService; + Messages = messageService; } } \ No newline at end of file diff --git a/LittleShop.Client/Models/CustomerMessage.cs b/LittleShop.Client/Models/CustomerMessage.cs new file mode 100644 index 0000000..41fe0e4 --- /dev/null +++ b/LittleShop.Client/Models/CustomerMessage.cs @@ -0,0 +1,24 @@ +namespace LittleShop.Client.Models; + +public class CustomerMessage +{ + public Guid Id { get; set; } + public Guid CustomerId { get; set; } + public long TelegramUserId { get; set; } + public string Subject { get; set; } = string.Empty; + public string Content { get; set; } = string.Empty; + public MessageType Type { get; set; } + public bool IsUrgent { get; set; } + public string? OrderReference { get; set; } + public DateTime CreatedAt { get; set; } +} + +public enum MessageType +{ + OrderUpdate = 0, + PaymentReminder = 1, + ShippingInfo = 2, + CustomerService = 3, + Marketing = 4, + SystemAlert = 5 +} \ No newline at end of file diff --git a/LittleShop.Client/Services/IMessageService.cs b/LittleShop.Client/Services/IMessageService.cs new file mode 100644 index 0000000..6e6a4dd --- /dev/null +++ b/LittleShop.Client/Services/IMessageService.cs @@ -0,0 +1,11 @@ +using LittleShop.Client.Models; + +namespace LittleShop.Client.Services; + +public interface IMessageService +{ + Task> GetPendingMessagesAsync(string platform = "Telegram"); + Task MarkMessageAsSentAsync(Guid messageId, string? platformMessageId = null); + Task MarkMessageAsFailedAsync(Guid messageId, string reason); + Task CreateCustomerMessageAsync(object messageData); +} \ No newline at end of file diff --git a/LittleShop.Client/Services/MessageService.cs b/LittleShop.Client/Services/MessageService.cs new file mode 100644 index 0000000..0a1aed1 --- /dev/null +++ b/LittleShop.Client/Services/MessageService.cs @@ -0,0 +1,87 @@ +using System.Net.Http.Json; +using Microsoft.Extensions.Logging; +using LittleShop.Client.Models; + +namespace LittleShop.Client.Services; + +public class MessageService : IMessageService +{ + private readonly HttpClient _httpClient; + private readonly ILogger _logger; + + public MessageService(HttpClient httpClient, ILogger logger) + { + _httpClient = httpClient; + _logger = logger; + } + + public async Task> GetPendingMessagesAsync(string platform = "Telegram") + { + try + { + var response = await _httpClient.GetAsync($"api/bot/messages/pending?platform={platform}"); + + if (response.IsSuccessStatusCode) + { + var messages = await response.Content.ReadFromJsonAsync>(); + return messages ?? new List(); + } + + _logger.LogWarning("Failed to get pending messages: {StatusCode}", response.StatusCode); + return new List(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Error getting pending messages"); + return new List(); + } + } + + public async Task MarkMessageAsSentAsync(Guid messageId, string? platformMessageId = null) + { + try + { + var url = $"api/bot/messages/{messageId}/mark-sent"; + if (!string.IsNullOrEmpty(platformMessageId)) + { + url += $"?platformMessageId={platformMessageId}"; + } + + var response = await _httpClient.PostAsync(url, null); + return response.IsSuccessStatusCode; + } + catch (Exception ex) + { + _logger.LogError(ex, "Error marking message {MessageId} as sent", messageId); + return false; + } + } + + public async Task MarkMessageAsFailedAsync(Guid messageId, string reason) + { + try + { + var response = await _httpClient.PostAsJsonAsync($"api/bot/messages/{messageId}/mark-failed", reason); + return response.IsSuccessStatusCode; + } + catch (Exception ex) + { + _logger.LogError(ex, "Error marking message {MessageId} as failed", messageId); + return false; + } + } + + public async Task CreateCustomerMessageAsync(object messageData) + { + try + { + var response = await _httpClient.PostAsJsonAsync("api/bot/messages/customer-create", messageData); + return response.IsSuccessStatusCode; + } + catch (Exception ex) + { + _logger.LogError(ex, "Error creating customer message"); + return false; + } + } +} \ No newline at end of file diff --git a/LittleShop/Areas/Admin/Controllers/MessagesController.cs b/LittleShop/Areas/Admin/Controllers/MessagesController.cs new file mode 100644 index 0000000..fd818d2 --- /dev/null +++ b/LittleShop/Areas/Admin/Controllers/MessagesController.cs @@ -0,0 +1,72 @@ +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using LittleShop.DTOs; +using LittleShop.Services; +using LittleShop.Models; + +namespace LittleShop.Areas.Admin.Controllers; + +[Area("Admin")] +[Authorize(Policy = "AdminOnly")] +public class MessagesController : Controller +{ + private readonly ICustomerMessageService _messageService; + private readonly ILogger _logger; + + public MessagesController(ICustomerMessageService messageService, ILogger logger) + { + _messageService = messageService; + _logger = logger; + } + + public async Task Index() + { + var threads = await _messageService.GetActiveThreadsAsync(); + return View(threads); + } + + public async Task Customer(Guid id) + { + var conversation = await _messageService.GetMessageThreadAsync(id); + if (conversation == null) + { + return NotFound(); + } + + return View(conversation); + } + + [HttpPost] + public async Task Reply(Guid customerId, string content, bool isUrgent = false) + { + try + { + var createMessageDto = new CreateCustomerMessageDto + { + CustomerId = customerId, + Type = MessageType.CustomerService, + Subject = "Support Reply", // Simple subject for admin replies + Content = content, + IsUrgent = isUrgent, + Priority = isUrgent ? 1 : 5 + }; + + var message = await _messageService.CreateMessageAsync(createMessageDto); + if (message != null) + { + TempData["Success"] = "Reply sent successfully!"; + } + else + { + TempData["Error"] = "Failed to send reply."; + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Error sending reply"); + TempData["Error"] = "An error occurred sending the reply."; + } + + return RedirectToAction("Customer", new { id = customerId }); + } +} \ No newline at end of file diff --git a/LittleShop/Areas/Admin/Views/Messages/Customer.cshtml b/LittleShop/Areas/Admin/Views/Messages/Customer.cshtml new file mode 100644 index 0000000..33e6289 --- /dev/null +++ b/LittleShop/Areas/Admin/Views/Messages/Customer.cshtml @@ -0,0 +1,149 @@ +@model LittleShop.DTOs.MessageThreadDto + +@{ + ViewData["Title"] = $"Conversation with {Model.CustomerName}"; +} + +
+
+
+
+

Conversation with @Model.CustomerName

+ + Back to Messages + +
+ + @if (TempData["Success"] != null) + { + + } + + @if (TempData["Error"] != null) + { + + } + +
+
+ +
+
+
Conversation with @Model.CustomerName
+ + @Model.MessageCount messages since @Model.StartedAt.ToString("MMM dd, yyyy") + +
+
+ @foreach (var message in Model.Messages.OrderBy(m => m.CreatedAt)) + { +
+
+
+
+
+ + @if (message.Direction == 0) + { + + @:Admin + } + else + { + + @Model.CustomerName + } + + + @message.CreatedAt.ToString("MMM dd, HH:mm") + +
+
+ @Html.Raw(message.Content.Replace("\n", "
")) +
+ @if (!string.IsNullOrEmpty(message.OrderReference)) + { +
+ + Order @message.OrderReference + +
+ } + @if (message.IsUrgent) + { + Urgent + } +
+
+
+
+ } +
+
+
+ +
+ +
+
+
Customer Information
+
+
+

Name: @Model.CustomerName

+

Messages: @Model.MessageCount

+

First Contact: @Model.StartedAt.ToString("MMM dd, yyyy HH:mm")

+

Last Message: @Model.LastMessageAt.ToString("MMM dd, yyyy HH:mm")

+ @if (Model.HasUnreadMessages) + { +
+ Has unread messages +
+ } + @if (Model.RequiresResponse) + { +
+ Requires response +
+ } +
+
+ + +
+
+
Send Reply
+
+
+
+ + +
+ + +
+ +
+ + +
+ + +
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/LittleShop/Areas/Admin/Views/Messages/Index.cshtml b/LittleShop/Areas/Admin/Views/Messages/Index.cshtml new file mode 100644 index 0000000..05eb221 --- /dev/null +++ b/LittleShop/Areas/Admin/Views/Messages/Index.cshtml @@ -0,0 +1,86 @@ +@model IEnumerable + +@{ + ViewData["Title"] = "Customer Messages"; +} + +
+
+
+
+

Customer Messages

+
+ + @if (!Model.Any()) + { +
+ No customer messages yet. +
+ } + else + { +
+
+
Active Conversations
+
+
+
+ + + + + + + + + + + + + @foreach (var thread in Model.OrderByDescending(t => t.LastMessageAt)) + { + + + + + + + + + } + +
CustomerSubjectLast MessageMessagesStatusActions
+ @thread.CustomerName +
Customer conversation + 		+ Latest activity + + @thread.LastMessageAt.ToString("MMM dd, HH:mm") +
Started: @thread.StartedAt.ToString("MMM dd") + 		+ @thread.MessageCount + @if (thread.HasUnreadMessages) + { + Unread + } + + @if (thread.RequiresResponse) + { + Needs Response + } + else + { + Up to date + } + + + View Conversation + +
+
+
+
+ } +
+
+
\ No newline at end of file diff --git a/LittleShop/Areas/Admin/Views/Orders/Details.cshtml b/LittleShop/Areas/Admin/Views/Orders/Details.cshtml index b3bac4c..28c8f6f 100644 --- a/LittleShop/Areas/Admin/Views/Orders/Details.cshtml +++ b/LittleShop/Areas/Admin/Views/Orders/Details.cshtml @@ -12,8 +12,11 @@
@if (Model.Customer != null) { - } diff --git a/LittleShop/Areas/Admin/Views/Shared/_Layout.cshtml b/LittleShop/Areas/Admin/Views/Shared/_Layout.cshtml index 85dd589..b4890d2 100644 --- a/LittleShop/Areas/Admin/Views/Shared/_Layout.cshtml +++ b/LittleShop/Areas/Admin/Views/Shared/_Layout.cshtml @@ -40,6 +40,11 @@ Orders +
  • + + Messages + +
  • Shipping diff --git a/LittleShop/Controllers/BotMessagesController.cs b/LittleShop/Controllers/BotMessagesController.cs index 023cc20..236c29b 100644 --- a/LittleShop/Controllers/BotMessagesController.cs +++ b/LittleShop/Controllers/BotMessagesController.cs @@ -72,10 +72,60 @@ public class BotMessagesController : ControllerBase return Ok(message); } + + [HttpPost("customer-create")] + public async Task CreateCustomerMessage([FromBody] CreateCustomerMessageFromTelegramDto dto) + { + try + { + // Create CustomerToAdmin message directly + var message = new CustomerMessage + { + Id = Guid.NewGuid(), + CustomerId = dto.CustomerId, + OrderId = dto.OrderId, + Direction = MessageDirection.CustomerToAdmin, + Type = dto.Type, + Subject = dto.Subject, + Content = dto.Content, + Status = MessageStatus.Read, // Customer messages are immediately "read" by system + Platform = "Telegram", + Priority = dto.Priority, + IsUrgent = dto.IsUrgent, + CreatedAt = DateTime.UtcNow, + ThreadId = Guid.NewGuid() // Will be updated if part of existing thread + }; + + // Save directly to database (bypass the regular CreateMessageAsync which is for AdminToCustomer) + var result = await _messageService.CreateCustomerToAdminMessageAsync(message); + if (!result) + { + return BadRequest("Failed to create customer message"); + } + + return Ok(); + } + catch (Exception ex) + { + return BadRequest($"Error creating customer message: {ex.Message}"); + } + } } // TEMPORARY DTO FOR TESTING public class CreateTestMessageDto +{ + public Guid CustomerId { get; set; } + public Guid? OrderId { get; set; } + public MessageType Type { get; set; } + public string Subject { get; set; } = string.Empty; + public string Content { get; set; } = string.Empty; + public int Priority { get; set; } = 5; + public bool IsUrgent { get; set; } = false; +} + +// DTO for customer messages from Telegram +public class CreateCustomerMessageFromTelegramDto { public Guid CustomerId { get; set; } public Guid? OrderId { get; set; } diff --git a/LittleShop/Services/CustomerMessageService.cs b/LittleShop/Services/CustomerMessageService.cs index c7e4ac2..c991a83 100644 --- a/LittleShop/Services/CustomerMessageService.cs +++ b/LittleShop/Services/CustomerMessageService.cs @@ -30,18 +30,8 @@ public class CustomerMessageService : ICustomerMessageService message.Status = MessageStatus.Pending; message.Platform = "Telegram"; - // Generate thread ID if this is a new conversation - if (message.ParentMessageId == null) - { - message.ThreadId = Guid.NewGuid(); - } - else - { - // Get parent message's thread ID - var parentMessage = await _context.CustomerMessages - .FirstOrDefaultAsync(m => m.Id == message.ParentMessageId); - message.ThreadId = parentMessage?.ThreadId ?? Guid.NewGuid(); - } + // Use customer-based threading - all messages for a customer are in one conversation + message.ThreadId = message.CustomerId; _context.CustomerMessages.Add(message); await _context.SaveChangesAsync(); @@ -161,28 +151,29 @@ public class CustomerMessageService : ICustomerMessageService return true; } - public async Task GetMessageThreadAsync(Guid threadId) + public async Task GetMessageThreadAsync(Guid customerId) { + // Get all messages for this customer (customer-based conversation) var messages = await _context.CustomerMessages .Include(m => m.Customer) .Include(m => m.Order) .Include(m => m.AdminUser) - .Where(m => m.ThreadId == threadId) + .Where(m => m.CustomerId == customerId && !m.IsArchived) .OrderBy(m => m.CreatedAt) .ToListAsync(); if (!messages.Any()) return null; - var firstMessage = messages.First(); + var customer = messages.First().Customer; var thread = new MessageThreadDto { - ThreadId = threadId, - Subject = firstMessage.Subject, - CustomerId = firstMessage.CustomerId, - CustomerName = firstMessage.Customer?.DisplayName ?? "Unknown", - OrderId = firstMessage.OrderId, - OrderReference = firstMessage.Order?.Id.ToString().Substring(0, 8), - StartedAt = firstMessage.CreatedAt, + ThreadId = customerId, // Use CustomerId as thread identifier + Subject = customer?.DisplayName ?? "Unknown Customer", // Customer name as subject + CustomerId = customerId, + CustomerName = customer?.DisplayName ?? "Unknown", + OrderId = null, // No single order - conversation spans multiple orders + OrderReference = null, // No single order reference + StartedAt = messages.Min(m => m.CreatedAt), LastMessageAt = messages.Max(m => m.CreatedAt), MessageCount = messages.Count, HasUnreadMessages = messages.Any(m => m.Direction == MessageDirection.CustomerToAdmin && m.Status != MessageStatus.Read), @@ -195,19 +186,20 @@ public class CustomerMessageService : ICustomerMessageService public async Task> GetActiveThreadsAsync() { + // Group by Customer instead of ThreadId for customer-based conversations var threads = await _context.CustomerMessages .Include(m => m.Customer) .Include(m => m.Order) .Where(m => !m.IsArchived) - .GroupBy(m => m.ThreadId) + .GroupBy(m => m.CustomerId) .Select(g => new MessageThreadDto { - ThreadId = g.Key ?? Guid.Empty, - Subject = g.First().Subject, + ThreadId = g.First().CustomerId, // Use CustomerId as conversation identifier + Subject = g.First().Customer != null ? g.First().Customer.DisplayName : "Unknown Customer", CustomerId = g.First().CustomerId, CustomerName = g.First().Customer != null ? g.First().Customer.DisplayName : "Unknown", - OrderId = g.First().OrderId, - OrderReference = g.First().Order != null ? g.First().Order.Id.ToString().Substring(0, 8) : null, + OrderId = null, // No single order - will show multiple orders in thread + OrderReference = null, // No single order reference StartedAt = g.Min(m => m.CreatedAt), LastMessageAt = g.Max(m => m.CreatedAt), MessageCount = g.Count(), @@ -230,4 +222,26 @@ public class CustomerMessageService : ICustomerMessageService { return await _context.Orders.AnyAsync(o => o.Id == orderId && o.CustomerId == customerId); } + + public async Task CreateCustomerToAdminMessageAsync(CustomerMessage message) + { + try + { + // Use customer-based threading for all messages + message.ThreadId = message.CustomerId; + + _context.CustomerMessages.Add(message); + await _context.SaveChangesAsync(); + + _logger.LogInformation("Created customer message {MessageId} from customer {CustomerId}", + message.Id, message.CustomerId); + + return true; + } + catch (Exception ex) + { + _logger.LogError(ex, "Error creating customer message from customer {CustomerId}", message.CustomerId); + return false; + } + } } \ No newline at end of file diff --git a/LittleShop/Services/ICustomerMessageService.cs b/LittleShop/Services/ICustomerMessageService.cs index 802cf3f..5143503 100644 --- a/LittleShop/Services/ICustomerMessageService.cs +++ b/LittleShop/Services/ICustomerMessageService.cs @@ -17,4 +17,5 @@ public interface ICustomerMessageService Task> GetActiveThreadsAsync(); Task ValidateCustomerExistsAsync(Guid customerId); Task ValidateOrderBelongsToCustomerAsync(Guid orderId, Guid customerId); + Task CreateCustomerToAdminMessageAsync(CustomerMessage message); } \ No newline at end of file diff --git a/LittleShop/littleshop.db-shm b/LittleShop/littleshop.db-shm index 71d052a9807783c1a9ce3fc6b332a494ce9356ab..4b16b3fcb387ec85555b6fb829af1b242f9418f9 100644 GIT binary patch delta 356 zcmZo@U}|V!s+V}A%K!o#K+MR%Am9h29f8M2{FRkmfkB_aiop{sCBmS{V8CF_;I;9iBID#Uz8u`r3~CHo z45kbY3@#f#9%SScWl&-;WUyiI2C3lWXOLmgW-w!L1@V|Q7@Q`4Tt0bT5F58LgF1r| zgDo%|d^Uc3%fu6Ol9u? delta 246 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 P^!>q@uKF;x&ddD|*t3(d delta 11 TcmexxPI$smwuUW?6BYpgBrXM% diff --git a/TeleBot/TeleBot/Handlers/CallbackHandler.cs b/TeleBot/TeleBot/Handlers/CallbackHandler.cs index 4f1a219..62b216a 100644 --- a/TeleBot/TeleBot/Handlers/CallbackHandler.cs +++ b/TeleBot/TeleBot/Handlers/CallbackHandler.cs @@ -124,10 +124,18 @@ namespace TeleBot.Handlers await HandleHelp(bot, callbackQuery.Message); break; + case "support": + await HandleSupportCallback(bot, callbackQuery, session); + break; + case "noop": // No operation - used for display-only buttons break; + case "cancel_support": + await HandleCancelSupport(bot, callbackQuery, session); + break; + default: _logger.LogWarning("Unknown callback action: {Action}", action); break; @@ -592,5 +600,36 @@ namespace TeleBot.Handlers replyMarkup: MenuBuilder.MainMenu() ); } + + private async Task HandleSupportCallback(ITelegramBotClient bot, CallbackQuery callbackQuery, UserSession session) + { + session.State = SessionState.CustomerSupport; + + await bot.EditMessageTextAsync( + callbackQuery.Message!.Chat.Id, + callbackQuery.Message.MessageId, + "🎧 *Customer Support*\n\n" + + "You can now send a message to our support team. Simply type your message and we'll respond as soon as possible.\n\n" + + "_Type your message below, or use the Cancel button to return to the main menu._", + parseMode: Telegram.Bot.Types.Enums.ParseMode.Markdown, + replyMarkup: MenuBuilder.SupportMenu() + ); + + await bot.AnswerCallbackQueryAsync(callbackQuery.Id); + } + + private async Task HandleCancelSupport(ITelegramBotClient bot, CallbackQuery callbackQuery, UserSession session) + { + session.State = SessionState.MainMenu; + + await bot.EditMessageTextAsync( + callbackQuery.Message!.Chat.Id, + callbackQuery.Message.MessageId, + "Customer support cancelled. How can I help you today?", + replyMarkup: MenuBuilder.MainMenu() + ); + + await bot.AnswerCallbackQueryAsync(callbackQuery.Id); + } } } \ No newline at end of file diff --git a/TeleBot/TeleBot/Handlers/CommandHandler.cs b/TeleBot/TeleBot/Handlers/CommandHandler.cs index 96da9a1..4b7b10d 100644 --- a/TeleBot/TeleBot/Handlers/CommandHandler.cs +++ b/TeleBot/TeleBot/Handlers/CommandHandler.cs @@ -84,6 +84,14 @@ namespace TeleBot.Handlers await HandleClearCommand(bot, message, session); break; + case "/support": + await HandleSupportCommand(bot, message, session); + break; + + case "/cancel": + await HandleCancelCommand(bot, message, session); + break; + default: await bot.SendTextMessageAsync( message.Chat.Id, @@ -297,5 +305,30 @@ namespace TeleBot.Handlers replyMarkup: MenuBuilder.MainMenu() ); } + + private async Task HandleSupportCommand(ITelegramBotClient bot, Message message, Models.UserSession session) + { + session.State = Models.SessionState.CustomerSupport; + + await bot.SendTextMessageAsync( + message.Chat.Id, + "🎧 *Customer Support*\n\n" + + "You can now send a message to our support team. Simply type your message and we'll respond as soon as possible.\n\n" + + "_Type your message below, or use /cancel to return to the main menu._", + parseMode: Telegram.Bot.Types.Enums.ParseMode.Markdown, + replyMarkup: MenuBuilder.SupportMenu() + ); + } + + private async Task HandleCancelCommand(ITelegramBotClient bot, Message message, Models.UserSession session) + { + session.State = Models.SessionState.MainMenu; + + await bot.SendTextMessageAsync( + message.Chat.Id, + "Operation cancelled. How can I help you today?", + replyMarkup: MenuBuilder.MainMenu() + ); + } } } \ No newline at end of file diff --git a/TeleBot/TeleBot/Handlers/MessageHandler.cs b/TeleBot/TeleBot/Handlers/MessageHandler.cs index 14f7216..aafba20 100644 --- a/TeleBot/TeleBot/Handlers/MessageHandler.cs +++ b/TeleBot/TeleBot/Handlers/MessageHandler.cs @@ -18,13 +18,16 @@ namespace TeleBot.Handlers { private readonly ISessionManager _sessionManager; private readonly ILogger _logger; + private readonly ILittleShopService _shopService; public MessageHandler( ISessionManager sessionManager, - ILogger logger) + ILogger logger, + ILittleShopService shopService) { _sessionManager = sessionManager; _logger = logger; + _shopService = shopService; } public async Task HandleMessageAsync(ITelegramBotClient bot, Message message) @@ -41,6 +44,11 @@ namespace TeleBot.Handlers { await HandleCheckoutInput(bot, message, session); } + // Handle customer support messages + else if (session.State == SessionState.CustomerSupport) + { + await HandleCustomerSupportMessage(bot, message, session); + } else if (message.Text.StartsWith("/pgpkey ")) { // Handle PGP key input @@ -221,5 +229,53 @@ namespace TeleBot.Handlers break; } } + + private async Task HandleCustomerSupportMessage(ITelegramBotClient bot, Message message, UserSession session) + { + try + { + // Send the customer's message to the business + var success = await _shopService.SendCustomerMessageAsync( + message.From!.Id, + message.From.Username ?? "", + $"{message.From.FirstName} {message.From.LastName}".Trim(), + message.From.FirstName ?? "", + message.From.LastName ?? "", + "Customer Message", // Simple subject + message.Text! + ); + + if (success) + { + await bot.SendTextMessageAsync( + message.Chat.Id, + "✅ *Message sent to support team*\n\n" + + "We've received your message and will respond as soon as possible.\n\n" + + "You can continue shopping or send additional messages.", + parseMode: Telegram.Bot.Types.Enums.ParseMode.Markdown, + replyMarkup: MenuBuilder.MainMenu() + ); + + session.State = SessionState.MainMenu; + } + else + { + await bot.SendTextMessageAsync( + message.Chat.Id, + "❌ Sorry, there was an error sending your message. Please try again.", + replyMarkup: MenuBuilder.SupportMenu() + ); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Error handling customer support message"); + await bot.SendTextMessageAsync( + message.Chat.Id, + "❌ An error occurred. Please try again or use /cancel to return to the menu.", + replyMarkup: MenuBuilder.SupportMenu() + ); + } + } } } \ No newline at end of file diff --git a/TeleBot/TeleBot/Models/UserSession.cs b/TeleBot/TeleBot/Models/UserSession.cs index f00fcfb..12f75a5 100644 --- a/TeleBot/TeleBot/Models/UserSession.cs +++ b/TeleBot/TeleBot/Models/UserSession.cs @@ -97,6 +97,7 @@ namespace TeleBot.Models ViewingOrders, ViewingOrder, PrivacySettings, + CustomerSupport, Help } } \ No newline at end of file diff --git a/TeleBot/TeleBot/Program.cs b/TeleBot/TeleBot/Program.cs index 7c63eb3..9c2605a 100644 --- a/TeleBot/TeleBot/Program.cs +++ b/TeleBot/TeleBot/Program.cs @@ -83,6 +83,11 @@ builder.Services.AddHttpClient(); builder.Services.AddSingleton(); builder.Services.AddHostedService(); +// Message Delivery Service - Single instance +builder.Services.AddSingleton(); +builder.Services.AddSingleton(sp => sp.GetRequiredService()); +builder.Services.AddHostedService(sp => sp.GetRequiredService()); + // Bot Service builder.Services.AddHostedService(); diff --git a/TeleBot/TeleBot/Services/LittleShopService.cs b/TeleBot/TeleBot/Services/LittleShopService.cs index 2643c6b..5838a4f 100644 --- a/TeleBot/TeleBot/Services/LittleShopService.cs +++ b/TeleBot/TeleBot/Services/LittleShopService.cs @@ -23,6 +23,7 @@ namespace TeleBot.Services Task?> GetPendingMessagesAsync(); Task MarkMessageAsSentAsync(Guid messageId, string? platformMessageId = null); Task MarkMessageAsFailedAsync(Guid messageId, string reason); + Task SendCustomerMessageAsync(long telegramUserId, string telegramUsername, string displayName, string firstName, string lastName, string subject, string content); } public class LittleShopService : ILittleShopService @@ -331,30 +332,22 @@ namespace TeleBot.Services if (!await AuthenticateAsync()) return null; - // Call API to get pending messages for Telegram platform - var response = await _client.HttpClient.GetAsync("api/messages/pending?platform=Telegram"); + // Use the client messages service + var messages = await _client.Messages.GetPendingMessagesAsync("Telegram"); - if (response.IsSuccessStatusCode) + // Convert to TeleBot CustomerMessage format + return messages.Select(m => new CustomerMessage { - var messages = await response.Content.ReadFromJsonAsync>(); - - // Convert to simplified CustomerMessage format - return messages?.Select(m => new CustomerMessage - { - Id = m.Id, - CustomerId = m.CustomerId, - TelegramUserId = m.TelegramUserId, - Subject = m.Subject, - Content = m.Content, - Type = (MessageType)m.Type, - IsUrgent = m.IsUrgent, - OrderReference = m.OrderReference, - CreatedAt = m.CreatedAt - }).ToList(); - } - - _logger.LogWarning("Failed to get pending messages: {StatusCode}", response.StatusCode); - return new List(); + Id = m.Id, + CustomerId = m.CustomerId, + TelegramUserId = m.TelegramUserId, + Subject = m.Subject, + Content = m.Content, + Type = (MessageType)m.Type, + IsUrgent = m.IsUrgent, + OrderReference = m.OrderReference, + CreatedAt = m.CreatedAt + }).ToList(); } catch (Exception ex) { @@ -370,14 +363,7 @@ namespace TeleBot.Services if (!await AuthenticateAsync()) return false; - var url = $"api/messages/{messageId}/mark-sent"; - if (!string.IsNullOrEmpty(platformMessageId)) - { - url += $"?platformMessageId={platformMessageId}"; - } - - var response = await _client.HttpClient.PostAsync(url, null); - return response.IsSuccessStatusCode; + return await _client.Messages.MarkMessageAsSentAsync(messageId, platformMessageId); } catch (Exception ex) { @@ -393,8 +379,7 @@ namespace TeleBot.Services if (!await AuthenticateAsync()) return false; - var response = await _client.HttpClient.PostAsJsonAsync($"api/messages/{messageId}/mark-failed", reason); - return response.IsSuccessStatusCode; + return await _client.Messages.MarkMessageAsFailedAsync(messageId, reason); } catch (Exception ex) { @@ -418,5 +403,52 @@ namespace TeleBot.Services _ => 0 // Default to BTC }; } + + public async Task SendCustomerMessageAsync(long telegramUserId, string telegramUsername, string displayName, string firstName, string lastName, string subject, string content) + { + try + { + if (!await AuthenticateAsync()) + return false; + + // First, get or create the customer + var customer = await _client.Customers.GetOrCreateCustomerAsync(new CreateCustomerRequest + { + TelegramUserId = telegramUserId, + TelegramUsername = telegramUsername, + TelegramDisplayName = displayName, + TelegramFirstName = firstName, + TelegramLastName = lastName, + AllowOrderUpdates = true, + AllowMarketing = false + }); + + if (!customer.IsSuccess || customer.Data == null) + { + _logger.LogError("Failed to get or create customer for support message"); + return false; + } + + // Create the customer message + var messageData = new + { + CustomerId = customer.Data.Id, + Type = 3, // CustomerService + Subject = subject, + Content = content, + Direction = 1, // CustomerToAdmin + Priority = 5, + IsUrgent = false + }; + + var response = await _client.Messages.CreateCustomerMessageAsync(messageData); + return response; + } + catch (Exception ex) + { + _logger.LogError(ex, "Error sending customer message"); + return false; + } + } } } \ No newline at end of file diff --git a/TeleBot/TeleBot/Services/MessageDeliveryService.cs b/TeleBot/TeleBot/Services/MessageDeliveryService.cs index ff2edba..b3196cd 100644 --- a/TeleBot/TeleBot/Services/MessageDeliveryService.cs +++ b/TeleBot/TeleBot/Services/MessageDeliveryService.cs @@ -13,6 +13,7 @@ namespace TeleBot.Services public interface IMessageDeliveryService { Task DeliverPendingMessagesAsync(ITelegramBotClient bot); + void SetBotClient(ITelegramBotClient botClient); } public class MessageDeliveryService : IMessageDeliveryService, IHostedService @@ -22,6 +23,7 @@ namespace TeleBot.Services private readonly IConfiguration _configuration; private Timer? _deliveryTimer; private readonly int _pollIntervalSeconds; + private ITelegramBotClient? _botClient; public MessageDeliveryService( ILittleShopService shopService, @@ -34,6 +36,12 @@ namespace TeleBot.Services _pollIntervalSeconds = configuration.GetValue("MessageDelivery:PollIntervalSeconds", 30); } + public void SetBotClient(ITelegramBotClient botClient) + { + _botClient = botClient; + _logger.LogInformation("Bot client set for message delivery service"); + } + public Task StartAsync(CancellationToken cancellationToken) { _logger.LogInformation("Starting Message Delivery Service - polling every {Interval} seconds", _pollIntervalSeconds); @@ -55,12 +63,16 @@ namespace TeleBot.Services { try { - // This will be called by the timer, but we need bot instance - // For now, just log that we're checking - _logger.LogDebug("Checking for pending messages to deliver..."); + _logger.LogInformation("=== Checking for pending messages to deliver ==="); - // Note: We'll need to integrate this with the bot instance - // This is a placeholder for the polling mechanism + if (_botClient != null) + { + await DeliverPendingMessagesAsync(_botClient); + } + else + { + _logger.LogWarning("Bot client not available for message delivery"); + } } catch (Exception ex) { @@ -77,7 +89,7 @@ namespace TeleBot.Services if (pendingMessages?.Any() != true) { - _logger.LogDebug("No pending messages to deliver"); + _logger.LogInformation("No pending messages to deliver"); return; } diff --git a/TeleBot/TeleBot/TelegramBotService.cs b/TeleBot/TeleBot/TelegramBotService.cs index 31557f2..4218e26 100644 --- a/TeleBot/TeleBot/TelegramBotService.cs +++ b/TeleBot/TeleBot/TelegramBotService.cs @@ -23,6 +23,7 @@ namespace TeleBot private readonly ICommandHandler _commandHandler; private readonly ICallbackHandler _callbackHandler; private readonly IMessageHandler _messageHandler; + private readonly IMessageDeliveryService _messageDeliveryService; private ITelegramBotClient? _botClient; private CancellationTokenSource? _cancellationTokenSource; @@ -32,7 +33,8 @@ namespace TeleBot IServiceProvider serviceProvider, ICommandHandler commandHandler, ICallbackHandler callbackHandler, - IMessageHandler messageHandler) + IMessageHandler messageHandler, + IMessageDeliveryService messageDeliveryService) { _configuration = configuration; _logger = logger; @@ -40,6 +42,7 @@ namespace TeleBot _commandHandler = commandHandler; _callbackHandler = callbackHandler; _messageHandler = messageHandler; + _messageDeliveryService = messageDeliveryService; } public async Task StartAsync(CancellationToken cancellationToken) @@ -69,6 +72,12 @@ namespace TeleBot var me = await _botClient.GetMeAsync(cancellationToken); _logger.LogInformation("Bot started: @{Username} ({Id})", me.Username, me.Id); + + // Set bot client for message delivery service + if (_messageDeliveryService is MessageDeliveryService deliveryService) + { + deliveryService.SetBotClient(_botClient); + } } public Task StopAsync(CancellationToken cancellationToken) diff --git a/TeleBot/TeleBot/UI/MenuBuilder.cs b/TeleBot/TeleBot/UI/MenuBuilder.cs index 48d5abe..9a3de73 100644 --- a/TeleBot/TeleBot/UI/MenuBuilder.cs +++ b/TeleBot/TeleBot/UI/MenuBuilder.cs @@ -16,6 +16,7 @@ namespace TeleBot.UI new[] { InlineKeyboardButton.WithCallbackData("🛍️ Browse Products", "browse") }, new[] { InlineKeyboardButton.WithCallbackData("🛒 View Cart", "cart") }, new[] { InlineKeyboardButton.WithCallbackData("📦 My Orders", "orders") }, + new[] { InlineKeyboardButton.WithCallbackData("🎧 Customer Support", "support") }, new[] { InlineKeyboardButton.WithCallbackData("🔒 Privacy Settings", "privacy") }, new[] { InlineKeyboardButton.WithCallbackData("❓ Help", "help") } }); @@ -277,6 +278,19 @@ namespace TeleBot.UI }; } + public static InlineKeyboardMarkup SupportMenu() + { + var markup = new InlineKeyboardMarkup(new[] + { + new[] + { + InlineKeyboardButton.WithCallbackData("❌ Cancel", "cancel_support") + } + }); + + return markup; + } + private static string GetOrderStatusEmoji(int status) { return status switch diff --git a/TeleBot/TeleBot/UI/MessageFormatter.cs b/TeleBot/TeleBot/UI/MessageFormatter.cs index 3764504..9aa8f75 100644 --- a/TeleBot/TeleBot/UI/MessageFormatter.cs +++ b/TeleBot/TeleBot/UI/MessageFormatter.cs @@ -256,9 +256,11 @@ namespace TeleBot.UI "/browse - Browse products\n" + "/cart - View shopping cart\n" + "/orders - View your orders\n" + + "/support - Contact customer support\n" + "/privacy - Privacy settings\n" + "/pgpkey - Set PGP public key\n" + "/ephemeral - Toggle ephemeral mode\n" + + "/cancel - Cancel current operation\n" + "/delete - Delete all your data\n" + "/tor - Get Tor onion address\n" + "/help - Show this help message\n\n" +