Save and Get data is brought back inte V2

net-daemon · May 24, 2020 · 2ef53e2 · 2ef53e2
1 parent dfbf3bf
commit 2ef53e2
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 0 deletions.
diff --git a/src/App/NetDaemon.App/Common/Reactive/AppDaemonRxApp.cs b/src/App/NetDaemon.App/Common/Reactive/AppDaemonRxApp.cs
@@ -118,6 +118,13 @@ public RxEntity Entity(string entityId)
             return new RxEntity(this, new string[] { entityId });
         }
 
+        /// <inheritdoc/>
+        public T? GetData<T>(string id) where T : class
+        {
+            _ = _daemon ?? throw new NullReferenceException($"{nameof(_daemon)} cant be null!");
+            return _daemon.GetDataAsync<T>(id).Result;
+        }
+
         /// <inheritdoc/>
         public IDisposable RunDaily(string time, Action action)
         {
@@ -229,6 +236,13 @@ public void RunScript(params string[] script)
             }
         }
 
+        /// <inheritdoc/>
+        public void SaveData<T>(string id, T data)
+        {
+            _ = _daemon ?? throw new NullReferenceException($"{nameof(_daemon)} cant be null!");
+            _daemon.SaveDataAsync<T>(id, data).Wait();
+        }
+
         /// <inheritdoc/>
         public void SetState(string entityId, dynamic state, dynamic? attributes = null)
         {

diff --git a/src/App/NetDaemon.App/Common/Reactive/INetDaemonReactive.cs b/src/App/NetDaemon.App/Common/Reactive/INetDaemonReactive.cs
@@ -45,6 +45,20 @@ public interface INetDaemonReactive : INetDaemonAppBase, ICallService, IRxEntity
         /// </summary>
         IEnumerable<EntityState> States { get; }
 
+        /// <summary>
+        ///     Loads persistent data from unique id
+        /// </summary>
+        /// <param name="id">Unique Id of the data</param>
+        /// <returns>The data persistent or null if not exists</returns>
+        T? GetData<T>(string id) where T : class;
+
+        /// <summary>
+        ///     Saves any data with unique id, data have to be json serializable
+        /// </summary>
+        /// <param name="id">Unique id for all apps</param>
+        /// <param name="data">Dynamic data being saved</param>
+        void SaveData<T>(string id, T data);
+
         /// <summary>
         ///     Sets a state for entity
         /// </summary>
@@ -137,6 +151,7 @@ public interface IRxSchedule
         /// </summary>
         /// <param name="second">The timespan to schedule</param>
         IObservable<long> RunEveryMinute(short second);
+
         /// <summary>
         ///     Delays excecution of an action (timespan) time
         /// </summary>

diff --git a/tests/NetDaemon.Daemon.Tests/Reactive/RxAppTest.cs b/tests/NetDaemon.Daemon.Tests/Reactive/RxAppTest.cs
@@ -2,6 +2,7 @@
 using JoySoftware.HomeAssistant.NetDaemon.Daemon;
 using Moq;
 using System;
+using System.Dynamic;
 using System.Linq;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
@@ -323,5 +324,40 @@ public async Task WhenStateStaysSameForTimeItShouldCallFunction()
 
             Assert.True(isRun);
         }
+
+        [Fact]
+        public async Task SavedDataShouldReturnSameDataUsingExpando()
+        {
+            // ARRANGE
+            var daemonTask = await GetConnectedNetDaemonTask();
+            dynamic data = new ExpandoObject();
+            data.Item = "Some data";
+
+            // ACT
+            DefaultDaemonRxApp.SaveData("data_exists", data);
+            var collectedData = DefaultDaemonRxApp.GetData<ExpandoObject>("data_exists");
+
+            await daemonTask;
+
+            // ASSERT
+            Assert.Equal(data, collectedData);
+        }
+
+        [Fact]
+        public async Task GetDataShouldReturnCachedValue()
+        {
+            // ARRANGE
+            var daemonTask = await GetConnectedNetDaemonTask();
+            // ACT
+
+            DefaultDaemonRxApp.SaveData("GetDataShouldReturnCachedValue_id", "saved data");
+
+            DefaultDaemonRxApp.GetData<string>("GetDataShouldReturnCachedValue_id");
+
+            await daemonTask;
+            // ASSERT
+            DefaultDataRepositoryMock.Verify(n => n.Get<string>(It.IsAny<string>()), Times.Never);
+            DefaultDataRepositoryMock.Verify(n => n.Save<string>(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
+        }
     }
 }