Update ILayoutService implementation

Author: Invvard

src/InvvardDev.EZLayoutDisplay.Desktop/Service/Design/LayoutService.cs

@@ -8,7 +8,7 @@ namespace InvvardDev.EZLayoutDisplay.Desktop.Service.Design
 {
     public class LayoutService : ILayoutService
     {
-        public async Task<ErgodoxLayout> GetLayoutInfo(string layoutHashId)
+        public async Task<ErgodoxLayout> GetLayoutInfo(string layoutHashId, string layoutRevisionId)
         {
             Debug.WriteLine("Layout retrieved.");
 
@@ -19,15 +19,15 @@ public async Task<ErgodoxLayout> GetLayoutInfo(string layoutHashId)
         }
 
         /// <inheritdoc />
-        public async Task<ErgodoxLayout> GetErgodoxLayout(string layoutHashId)
+        public async Task<ErgodoxLayout> GetErgodoxLayout(string layoutHashId, string layoutRevisionId)
         {
             Debug.WriteLine("Layout retrieved.");
 
             return await new Task<ErgodoxLayout>(() => new ErgodoxLayout());
         }
 
         /// <inheritdoc />
-        public EZLayout PrepareEZLayout(ErgodoxLayout ergodoxLayout, string layoutRevisionIds)
+        public EZLayout PrepareEZLayout(ErgodoxLayout ergodoxLayouts)
         {
             Debug.WriteLine("Layout prepared");
 

src/InvvardDev.EZLayoutDisplay.Desktop/Service/Implementation/LayoutService.cs

@@ -17,48 +17,50 @@ public class LayoutService : ILayoutService
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         private readonly string GetLayoutBody =
-            "{{\"operationName\":\"getLayout\",\"variables\":{{\"hashId\":\"{0}\",\"revisionId\":\"latest\"}},\"query\":\"query getLayout($hashId: String!, $revisionId: String!) {{\\n  Layout(hashId: $hashId, revisionId: $revisionId) {{\\n ...LayoutData\\n }}\\n}}\\n\\nfragment LayoutData on Layout {{\\n geometry\\n hashId\\n title\\n tags {{\\n id\\n hashId\\n name\\n }}\\n revision {{\\n ...RevisionData\\n }}\\n}}\\n\\nfragment RevisionData on Revision {{\\n hashId\\n model\\n title\\n swatch\\n hexUrl\\n zipUrl\\n  qmkVersion\\n  qmkUptodate\\n  config\\n layers {{\\n hashId\\n keys\\n position\\n title\\n color\\n}}\\n}}\\n\"}}";
+            "{{\"operationName\":\"getLayout\",\"variables\":{{\"hashId\":\"{0}\",\"revisionId\":\"{1}\"}},\"query\":\"query getLayout($hashId: String!, $revisionId: String!) {{\\n  Layout(hashId: $hashId, revisionId: $revisionId) {{\\n ...LayoutData\\n }}\\n}}\\n\\nfragment LayoutData on Layout {{\\n geometry\\n hashId\\n title\\n tags {{\\n id\\n hashId\\n name\\n }}\\n revision {{\\n ...RevisionData\\n }}\\n}}\\n\\nfragment RevisionData on Revision {{\\n hashId\\n model\\n title\\n swatch\\n hexUrl\\n zipUrl\\n  qmkVersion\\n  qmkUptodate\\n  config\\n layers {{\\n hashId\\n keys\\n position\\n title\\n color\\n}}\\n}}\\n\"}}";
 
         private readonly string GetLayoutInfoRequestBody =
-            "{{\"operationName\":\"getLayout\",\"variables\":{{\"hashId\":\"{0}\",\"revisionId\":\"latest\"}},\"query\":\"query getLayout($hashId: String!, $revisionId: String!) {{\\n Layout(hashId: $hashId, revisionId: $revisionId) {{\\n ...LayoutData\\n __typename\\n }}\\n}}\\n\\nfragment LayoutData on Layout {{\\n geometry\\n hashId\\n title\\n tags {{\\n id\\n hashId\\n name\\n }}\\n revision {{\\n hashId\\n title\\n hexUrl\\n model\\n zipUrl\\n  qmkVersion\\n  qmkUptodate\\n layers {{\\n position\\n title\\n }}\\n }}\\n __typename\\n}}\\n\"}}";
+            "{{\"operationName\":\"getLayout\",\"variables\":{{\"hashId\":\"{0}\",\"revisionId\":\"{1}\"}},\"query\":\"query getLayout($hashId: String!, $revisionId: String!) {{\\n Layout(hashId: $hashId, revisionId: $revisionId) {{\\n ...LayoutData\\n __typename\\n }}\\n}}\\n\\nfragment LayoutData on Layout {{\\n geometry\\n hashId\\n title\\n tags {{\\n id\\n hashId\\n name\\n }}\\n revision {{\\n hashId\\n title\\n hexUrl\\n model\\n zipUrl\\n  qmkVersion\\n  qmkUptodate\\n layers {{\\n position\\n title\\n }}\\n }}\\n __typename\\n}}\\n\"}}";
 
         private const string GetLayoutRequestUri = "https://oryx.ergodox-ez.com/graphql";
 
         #region ILayoutService implementation
 
         /// <inheritdoc />
-        public async Task<ErgodoxLayout> GetLayoutInfo(string layoutHashId)
+        public async Task<ErgodoxLayout> GetLayoutInfo(string layoutHashId, string layoutRevisionId)
         {
             Logger.TraceMethod();
             Logger.DebugInputParam(nameof(layoutHashId), layoutHashId);
+            Logger.DebugInputParam(nameof(layoutRevisionId), layoutRevisionId);
 
             ValidateLayoutHashId(layoutHashId);
 
-            var info = await QueryData(layoutHashId, GetLayoutInfoRequestBody);
+            var info = await QueryData(layoutHashId, layoutRevisionId, GetLayoutInfoRequestBody);
 
             return info;
         }
 
         /// <inheritdoc />
-        public async Task<ErgodoxLayout> GetErgodoxLayout(string layoutHashId)
+        public async Task<ErgodoxLayout> GetErgodoxLayout(string layoutHashId, string layoutRevisionId)
         {
             Logger.TraceMethod();
             Logger.DebugInputParam(nameof(layoutHashId), layoutHashId);
+            Logger.DebugInputParam(nameof(layoutRevisionId), layoutRevisionId);
 
             ValidateLayoutHashId(layoutHashId);
 
-            var layout = await QueryData(layoutHashId, GetLayoutBody);
+            var layout = await QueryData(layoutHashId, layoutRevisionId, GetLayoutBody);
 
             return layout;
         }
 
         /// <inheritdoc />
-        public EZLayout PrepareEZLayout(ErgodoxLayout ergodoxLayout, string layoutRevisionId)
+        public EZLayout PrepareEZLayout(ErgodoxLayout ergodoxLayout)
         {
             Logger.TraceMethod();
 
             var ezLayoutMaker = new EZLayoutMaker();
-            EZLayout ezLayout = ezLayoutMaker.PrepareEZLayout(ergodoxLayout, layoutRevisionId);
+            EZLayout ezLayout = ezLayoutMaker.PrepareEZLayout(ergodoxLayout);
 
             return ezLayout;
         }
@@ -77,9 +79,9 @@ public async Task<IEnumerable<KeyTemplate>> GetLayoutTemplate()
 
         #region Private methods
 
-        private async Task<ErgodoxLayout> QueryData(string layoutHashId, string graphQlQuery)
+        private async Task<ErgodoxLayout> QueryData(string layoutHashId, string layoutRevisionId, string graphQlQuery)
         {
-            var requestBody = string.Format(graphQlQuery, layoutHashId);
+            var requestBody = string.Format(graphQlQuery, layoutHashId, layoutRevisionId);
 
             var layout = await HttpClientCall(requestBody);