Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix restaurant menu #134

Merged
merged 1 commit into from
Feb 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
alter table `restaurant_menu_item`
add column `product_id` bigint null;

alter table `restaurant_menu_item`
add column `order_item_modifiers` text null;
6 changes: 6 additions & 0 deletions src/SmartTalk.Core/Domain/Restaurants/RestaurantMenuItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ public class RestaurantMenuItem : IEntity
[Column("name"), StringLength(256)]
public string Name { get; set; }

[Column("product_id")]
public long ProductId { get; set; }

[Column("order_item_modifiers")]
public string OrderItemModifiers { get; set; }

[Column("language")]
public RestaurantItemLanguage Language { get; set; }

Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
using AutoMapper;
using Serilog;
using AutoMapper;
using Newtonsoft.Json;
using SmartTalk.Core.Ioc;
using SmartTalk.Core.Constants;
using SmartTalk.Core.Domain.Restaurants;
using SmartTalk.Core.Extensions;
using SmartTalk.Core.Ioc;
using SmartTalk.Core.Services.Http.Clients;
using SmartTalk.Core.Services.Jobs;
using SmartTalk.Core.Services.RetrievalDb.VectorDb;
using SmartTalk.Messages.Commands.Restaurant;
using SmartTalk.Messages.Constants;
using SmartTalk.Messages.Dto.EasyPos;
using SmartTalk.Messages.Dto.Embedding;
using SmartTalk.Messages.Dto.Restaurant;
using SmartTalk.Messages.Dto.Smarties;
using SmartTalk.Messages.Dto.VectorDb;
using SmartTalk.Messages.Dto.Embedding;
using SmartTalk.Core.Domain.Restaurants;
using SmartTalk.Messages.Dto.PhoneOrder;
using SmartTalk.Messages.Dto.Restaurant;
using SmartTalk.Messages.Enums.PhoneOrder;
using SmartTalk.Messages.Enums.Restaurants;
using SmartTalk.Core.Services.Http.Clients;
using SmartTalk.Messages.Commands.Restaurant;
using SmartTalk.Core.Services.RetrievalDb.VectorDb;

namespace SmartTalk.Core.Services.Restaurants;

Expand Down Expand Up @@ -112,12 +114,26 @@ private List<RestaurantMenuItem> GenerateMenuItems(EasyPosResponseProduct produc
if (product.Price == 0 && product.ModifierGroups.Any())
{
var modifierGroup = product.ModifierGroups.First();

var orderItemModifiers = new PhoneCallOrderItemModifiers
{
Quantity = 1,
ModifierId = modifierGroup.Id,
Localizations = modifierGroup.Localizations
};

foreach (var modifierProduct in modifierGroup.ModifierProducts)
{
orderItemModifiers.Price = modifierProduct.Price;
orderItemModifiers.ModifierProductId = modifierProduct.Id;
orderItemModifiers.ModifierLocalizations = modifierProduct.Localizations;

menuItems.Add(new RestaurantMenuItem
{
RestaurantId = restaurantId,
Price = modifierProduct.Price,
ProductId = product.Id,
OrderItemModifiers = JsonConvert.SerializeObject(orderItemModifiers),
Name = $"{GetMenuItemName(product.Localizations, language)} {GetMenuItemName(modifierProduct.Localizations, language)}",
Language = languageEnum
});
Expand All @@ -129,6 +145,7 @@ private List<RestaurantMenuItem> GenerateMenuItems(EasyPosResponseProduct produc
{
RestaurantId = restaurantId,
Price = product.Price,
ProductId = product.Id,
Name = GetMenuItemName(product.Localizations, language),
Language = languageEnum
});
Expand Down
9 changes: 9 additions & 0 deletions src/SmartTalk.Messages/Dto/EasyPos/EasyPosResponseDto.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,21 @@ public class EasyPosResponseLocalization

public class EasyPosResponseModifierGroups
{
[JsonProperty("id")]
public long Id { get; set; }

[JsonProperty("localizations")]
public List<EasyPosResponseLocalization> Localizations { get; set; }

[JsonProperty("modifierProducts")]
public List<EasyPosResponseModifierProducts> ModifierProducts { get; set; }
}

public class EasyPosResponseModifierProducts
{
[JsonProperty("id")]
public long Id { get; set; }

[JsonProperty("price")]
public decimal Price { get; set; }

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
using Newtonsoft.Json;
using SmartTalk.Messages.Dto.EasyPos;

namespace SmartTalk.Messages.Dto.PhoneOrder;

public class PhoneCallOrderItemModifiers
{
[JsonProperty("price")]
public decimal Price { get; set; }

[JsonProperty("quantity")]
public int Quantity { get; set; }

[JsonProperty("ModifierId")]
public long ModifierId { get; set; }

[JsonProperty("localizations")]
public List<EasyPosResponseLocalization> Localizations { get; set; }

[JsonProperty("modifierProductId")]
public long ModifierProductId { get; set; }

[JsonProperty("ModifierLocalizations")]
public List<EasyPosResponseLocalization> ModifierLocalizations { get; set; }
}