Merge pull request #23 from granstel/#15

Fix salute mapping

Author: granstel

src/FillInTheTextBot.Api/FillInTheTextBot.Api.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>1.14.0</Version>
+    <Version>1.15.1</Version>
     <PackageReleaseNotes>net6.0</PackageReleaseNotes>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>

src/FillInTheTextBot.Messengers.Sber/SberProfile.cs

@@ -77,8 +77,11 @@ public SberProfile()
                 .ForMember(d => d.ScopeKey, m => m.Ignore());
 
             CreateMap<InternalModels.Response, Response>()
-                .ForMember(d => d.Payload, m => m.MapFrom(s => s))
-                ;
+                .ForMember(d => d.Payload, m => m.MapFrom(s => s)) // See CreateMap<InternalModels.Response, ResponsePayload>()
+                .ForMember(d => d.MessageName, m => m.Ignore())
+                .ForMember(d => d.SessionId, m => m.Ignore())
+                .ForMember(d => d.MessageId, m => m.Ignore())
+                .ForMember(d => d.Uuid, m => m.Ignore());
 
             CreateMap<InternalModels.Response, ResponsePayload>()
                 .ForMember(d => d.PronounceText, m => m.MapFrom(s => s.Text))
@@ -93,7 +96,9 @@ public SberProfile()
                 }))
                 .ForMember(d => d.Items, m => m.MapFrom(s => s))
                 .ForMember(d => d.Suggestions, m => m.MapFrom(s => s.Buttons.Where(b => b.IsQuickReply)))
-                ;
+                .ForMember(d => d.Intent, m => m.Ignore())
+                .ForMember(d => d.ProjectName, m => m.Ignore())
+                .ForMember(d => d.Device, m => m.Ignore());
 
             CreateMap<string, Emotion>()
                 .ForMember(d => d.EmotionId, m => m.MapFrom(s => s));
@@ -106,7 +111,7 @@ public SberProfile()
             CreateMap<InternalModels.Button, Button>()
                 .ForMember(d => d.Title, m => m.MapFrom(s => s.Text))
                 .ForMember(d => d.Action, m => m.MapFrom(s => s))
-                ;
+                .ForMember(d => d.Actions, m => m.Ignore());
 
             CreateMap<InternalModels.Button, SberModels.Action>()
                 .ForMember(d => d.Text, m => m.MapFrom(s => s.Text))
@@ -133,18 +138,33 @@ public SberProfile()
                 .ForMember(d => d.Device, m => m.MapFrom(s => s.Device))
                 .ForMember(d => d.ProjectName, m => m.Ignore())
                 .ForMember(d => d.Intent, m => m.Ignore())
-                ;
+                .ForMember(d => d.PronounceText, m => m.Ignore())
+                .ForMember(d => d.PronounceTextType, m => m.Ignore())
+                .ForMember(d => d.Emotion, m => m.Ignore())
+                .ForMember(d => d.Items, m => m.Ignore())
+                .ForMember(d => d.Suggestions, m => m.Ignore())
+                .ForMember(d => d.AutoListening, m => m.Ignore())
+                .ForMember(d => d.Finished, m => m.Ignore());
         }
 
         private PayloadItem[] MapResponseToItem(InternalModels.Response source, PayloadItem[] destinations, ResolutionContext context)
         {
+            var result = new List<PayloadItem>();
+
             var itemWithBubble = new PayloadItem
             {
                 Bubble = { Text = source.Text }
             };
 
+            result.Add(itemWithBubble);
+
             var buttons = source.Buttons?.Where(b => !b.IsQuickReply).ToList();
 
+            if (buttons?.Any() != true)
+            {
+                return result.ToArray();
+            }
+
             var cardItems = buttons?.Select(b =>
             {
                 var cardItem = new CardCell
@@ -153,7 +173,7 @@ private PayloadItem[] MapResponseToItem(InternalModels.Response source, PayloadI
                     TopText = new CardCellText
                     {
                         Type = CellTypeValues.TextCellView,
-                        Text = string.Empty,
+                        Text = " ",
                         Typeface = TypefaceValues.Caption,
                         TextColor = TextColorValues.Default
                     },
@@ -193,12 +213,9 @@ private PayloadItem[] MapResponseToItem(InternalModels.Response source, PayloadI
                 ItemWidth = ItemWidthValues.Resizable
             };
 
-            var itemWithCard = new PayloadItem
-            {
-                Card = card
-            };
+            itemWithBubble.Card = card;
 
-            return new[] { itemWithBubble, itemWithCard };
+            return result.ToArray();
         }
 
         private Suggestion MapButtonsToSuggestion(IEnumerable<InternalModels.Button> source, Suggestion destination, ResolutionContext context)
@@ -213,4 +230,4 @@ private Suggestion MapButtonsToSuggestion(IEnumerable<InternalModels.Button> sou
             return suggest;
         }
     }
-}
+}