Code updated to 3.0.238

TINKLib/Model/Connector/Command/Command.cs

@@ -1,10 +1,11 @@
 using Serilog;
 using System;
 using System.Threading.Tasks;
-using TINK.Model.Repository;
-using TINK.Model.Repository.Request;
-using TINK.Model.Repository.Response;
+using TINK.Repository;
+using TINK.Repository.Request;
+using TINK.Repository.Response;
 using TINK.Model.User.Account;
+using TINK.Model.Device;
 
 namespace TINK.Model.Connector
 {
@@ -122,7 +123,8 @@ namespace TINK.Model.Connector
 
         public async Task DoReturn(
             Bikes.Bike.BluetoothLock.IBikeInfoMutable bike,
-            LocationDto location)
+            LocationDto location,
+            ISmartDevice smartDevice)
         {
             Log.ForContext<Command>().Error("Unexpected returning request detected. No user logged in.");
             await Task.CompletedTask;
@@ -132,7 +134,11 @@ namespace TINK.Model.Connector
         /// Submits feedback to copri server.
         /// </summary>
         /// <param name="userFeedback">Feedback to submit.</param>
+#if USCSHARP9
         public async Task DoSubmitFeedback(ICommand.IUserFeedback userFeedback, Uri opertorUri)
+#else
+        public async Task DoSubmitFeedback(IUserFeedback userFeedback, Uri opertorUri)
+#endif
         {
             Log.ForContext<Command>().Error("Unexpected submit feedback request detected. No user logged in.");
             await Task.CompletedTask;

TINKLib/Model/Connector/Command/CommandLoggedIn.cs

@@ -1,11 +1,12 @@
 using System;
 using System.Threading.Tasks;
 using TINK.Model.Bike.BluetoothLock;
-using TINK.Model.Repository;
-using TINK.Model.Repository.Exception;
-using TINK.Model.Repository.Request;
-using TINK.Model.Repository.Response;
+using TINK.Repository;
+using TINK.Repository.Exception;
+using TINK.Repository.Request;
+using TINK.Repository.Response;
 using TINK.Model.User.Account;
+using TINK.Model.Device;
 
 namespace TINK.Model.Connector
 {
@@ -30,7 +31,7 @@ namespace TINK.Model.Connector
         /// Logs user in.
         /// If log in succeeds either and session might be updated if it was no more valid (logged in by an different device).
         /// If log in fails (password modified) session cookie is set to empty.
-        /// If communication fails an TINK.Model.Repository.Exception is thrown.
+        /// If communication fails an TINK.Repository.Exception is thrown.
         /// </summary>
         /// <param name="p_oAccount">Account to use for login.</param>
         public Task<IAccount> DoLogin(string p_strMail, string p_strPassword, string p_strDeviceId)
@@ -242,12 +243,13 @@ namespace TINK.Model.Connector
         }
 
         /// <summary> Request to return a bike.</summary>
-        /// <param name="latitude">Latitude of the bike.</param>
-        /// <param name="longitude">Longitude of the bike.</param>
         /// <param name="bike">Bike to return.</param>
+        /// <param name="locaton">Position of the bike.</param>
+        /// <param name="smartDevice">Provides info about hard and software.</param>
         public async Task DoReturn(
             Bikes.Bike.BluetoothLock.IBikeInfoMutable bike,
-            LocationDto location)
+            LocationDto location,
+            ISmartDevice smartDevice)
         {
             if (bike == null)
             {
@@ -257,7 +259,7 @@ namespace TINK.Model.Connector
             ReservationCancelReturnResponse l_oResponse;
             try
             {
-                l_oResponse = (await CopriServer.DoReturn(bike.Id, location, bike.OperatorUri)).GetIsReturnBikeResponseOk(bike.Id);
+                l_oResponse = (await CopriServer.DoReturn(bike.Id, location, smartDevice,  bike.OperatorUri)).GetIsReturnBikeResponseOk(bike.Id);
             }
             catch (Exception)
             {
@@ -272,8 +274,12 @@ namespace TINK.Model.Connector
         /// Submits feedback to copri server.
         /// </summary>
         /// <param name="userFeedback">Feedback to submit.</param>
+#if USCSHARP9
         public async Task DoSubmitFeedback(ICommand.IUserFeedback userFeedback, Uri opertorUri)
-            => await CopriServer.DoSubmitFeedback(userFeedback.Message, userFeedback.IsBikeBroken, opertorUri);
-
+            => await CopriServer.DoSubmitFeedback(userFeedback.BikeId, userFeedback.Message, userFeedback.IsBikeBroken, opertorUri);
+#else
+        public async Task DoSubmitFeedback(IUserFeedback userFeedback, Uri opertorUri)
+            => await CopriServer.DoSubmitFeedback(userFeedback.BikeId, userFeedback.Message, userFeedback.IsBikeBroken, opertorUri);
+#endif
     }
 }

TINKLib/Model/Connector/Command/ICommand.cs

@@ -1,7 +1,8 @@
 using System;
 using System.Threading.Tasks;
-using TINK.Model.Repository.Request;
+using TINK.Repository.Request;
 using TINK.Model.User.Account;
+using TINK.Model.Device;
 
 namespace TINK.Model.Connector
 {
@@ -44,9 +45,10 @@ namespace TINK.Model.Connector
         Task DoBook(Bikes.Bike.BluetoothLock.IBikeInfoMutable bike);
 
         /// <summary> Request to return a bike.</summary>
-        /// <param name="location">Geolocation of lock when returning bike.</param>
         /// <param name="bike">Bike to return.</param>
-        Task DoReturn(Bikes.Bike.BluetoothLock.IBikeInfoMutable bike, LocationDto geolocation = null);
+        /// <param name="location">Geolocation of lock when returning bike.</param>
+        /// <param name="smartDevice">Provides info about hard and software.</param>
+        Task DoReturn(Bikes.Bike.BluetoothLock.IBikeInfoMutable bike, LocationDto geolocation = null, ISmartDevice smartDevice = null);
 
         /// <summary> True if connector has access to copri server, false if cached values are used. </summary>
         bool IsConnected { get; }
@@ -55,12 +57,15 @@ namespace TINK.Model.Connector
         string SessionCookie { get; }
 
         Task DoSubmitFeedback(IUserFeedback userFeedback, Uri opertorUri);
-
+#if USCSHARP9
         /// <summary>
         /// Feedback given by user when returning bike.
         /// </summary>
         public interface IUserFeedback
         {
+            /// <summary> Id of the bike to which the feedback is related to.</summary>
+            string BikeId { get; }
+
             /// <summary>
             /// Holds whether bike is broken or not.
             /// </summary>
@@ -74,12 +79,37 @@ namespace TINK.Model.Connector
             /// </summary>
             string Message { get;  }
         }
+#endif
     }
 
     /// <summary>Defines delegate to be raised whenever login state changes.</summary>
     /// <param name="p_oEventArgs">Holds session cookie and mail address if user logged in successfully.</param>
     public delegate void LoginStateChangedEventHandler(object p_oSender, LoginStateChangedEventArgs p_oEventArgs);
 
+#if !USCSHARP9
+    /// <summary>
+    /// Feedback given by user when returning bike.
+    /// </summary>
+    public interface IUserFeedback
+    {
+        /// <summary> Id of the bike to which the feedback is related to.</summary>
+        string BikeId { get; }
+
+        /// <summary>
+        /// Holds whether bike is broken or not.
+        /// </summary>
+        bool IsBikeBroken { get; }
+
+        /// <summary>
+        /// Holds either 
+        /// - general feedback
+        /// - error description of broken bike 
+        /// or both.
+        /// </summary>
+        string Message { get; }
+    }
+#endif
+
     /// <summary> Event arguments to notify about changes of logged in state.</summary>
     public class LoginStateChangedEventArgs : EventArgs
     {

TINKLib/Model/Connector/Command/UserFeedbackDto.cs

@@ -1,9 +1,25 @@
 
 namespace TINK.Model.Connector
 {
+#if USCSHARP9
     public record UserFeedbackDto : ICommand.IUserFeedback
     {
+        public string BikeId { get; init; }
         public bool IsBikeBroken { get; init; }
         public string Message { get; init; }
     }
+#else
+#if USCSHARP9
+    public class UserFeedbackDto : ICommand.IUserFeedback    
+#else
+    public class UserFeedbackDto : IUserFeedback
+#endif
+    {
+        public string BikeId { get; set; }
+
+        public bool IsBikeBroken { get; set; }
+
+        public string Message { get; set; }
+    }
+#endif
 }