Get rid off commit and iso storage workaround

StefanMaron · Jan 11, 2024 · 54dd037 · 54dd037
1 parent 6d6c71d
commit 54dd037
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/MSDyn365BC.Ntfy/src/EventTypes/SalesDocumentReleased.Codeunit.al b/MSDyn365BC.Ntfy/src/EventTypes/SalesDocumentReleased.Codeunit.al
@@ -28,8 +28,6 @@ codeunit 71179877 SalesDocumentReleasedNTSTM implements INtfyEventNTSTM
         NtfyEntry: Record NtfyEntryNTSTM;
         DoCall: Boolean;
     begin
-        IsolatedStorage.Set('NtfyDescription', StrSubstNo('Sales %1 - %2 - has been released', SalesHeader."Document Type", SalesHeader."No."), DataScope::User);
-
         NtfyEntry.SetRange(EventType, NtfyEntry.EventType::SalesDocumentReleased);
         NtfyEntry.SetFilter(NtfyTopic, '<>%1', '');
         if NtfyEntry.FindSet() then
@@ -48,6 +46,8 @@ codeunit 71179877 SalesDocumentReleasedNTSTM implements INtfyEventNTSTM
                     NtfyEntry.Mark(true);
             until NtfyEntry.Next() = 0;
 
+        NtfyEntry.NtfyMessage := StrSubstNo('Sales %1 - %2 - has been released', SalesHeader."Document Type", SalesHeader."No.");
+
         NtfyEntry.MarkedOnly(true);
         NtfyEntry.RunBatch();
     end;

diff --git a/MSDyn365BC.Ntfy/src/EventTypes/SalesDocumentReopened.Codeunit.al b/MSDyn365BC.Ntfy/src/EventTypes/SalesDocumentReopened.Codeunit.al
@@ -28,8 +28,6 @@ codeunit 71179878 SalesDocumentReopenedNTSTM implements INtfyEventNTSTM
         NtfyEntry: Record NtfyEntryNTSTM;
         DoCall: Boolean;
     begin
-        IsolatedStorage.Set('NtfyDescription', StrSubstNo('Sales %1 - %2 - has been released', SalesHeader."Document Type", SalesHeader."No."), DataScope::User);
-
         NtfyEntry.SetRange(EventType, NtfyEntry.EventType::SalesDocumentReopened);
         NtfyEntry.SetFilter(NtfyTopic, '<>%1', '');
         if NtfyEntry.FindSet() then
@@ -48,6 +46,8 @@ codeunit 71179878 SalesDocumentReopenedNTSTM implements INtfyEventNTSTM
                     NtfyEntry.Mark(true);
             until NtfyEntry.Next() = 0;
 
+        NtfyEntry.NtfyMessage := StrSubstNo('Sales %1 - %2 - has been reopened', SalesHeader."Document Type", SalesHeader."No.");
+
         NtfyEntry.MarkedOnly(true);
         NtfyEntry.RunBatch();
     end;

diff --git a/MSDyn365BC.Ntfy/src/foundation/BatchSendNtfys.Codeunit.al b/MSDyn365BC.Ntfy/src/foundation/BatchSendNtfys.Codeunit.al
@@ -8,19 +8,15 @@ codeunit 71179879 BatchSendNtfysNTSTM
 
     trigger OnRun()
     var
-        NtfyEntry: Record NtfyEntryNTSTM;
         RestClient: Codeunit "Rest Client";
         Body: Codeunit "Http Content";
-        Description: Text;
     begin
-        IsolatedStorage.Get('NtfyDescription', DataScope::User, Description);
-        Body.Create(Description);
-        IsolatedStorage.Delete('NtfyDescription', DataScope::User);
+        Body.Create(Rec.NtfyMessage);
 
-        if NtfyEntry.FindSet() then
+        if Rec.FindSet() then
             repeat
                 Clear(RestClient);
-                RestClient.Post(StrSubstNo('https://ntfy.sh/%1', NtfyEntry.NtfyTopic), Body);
-            until NtfyEntry.Next() = 0;
+                RestClient.Post(StrSubstNo('https://ntfy.sh/%1', Rec.NtfyTopic), Body);
+            until Rec.Next() = 0;
     end;
 }
diff --git a/MSDyn365BC.Ntfy/src/foundation/NtfyEntry.Table.al b/MSDyn365BC.Ntfy/src/foundation/NtfyEntry.Table.al
@@ -30,6 +30,16 @@ table 71179875 NtfyEntryNTSTM
             AllowInCustomizations = Never;
             Caption = 'Filter Text';
         }
+        field(5; NtfyTitle; Text[150])
+        {
+            Caption = 'Title';
+            //Temporary user only
+        }
+        field(6; NtfyMessage; Text[2048])
+        {
+            Caption = 'Message';
+            //Temporary user only
+        }
     }
 
     keys
@@ -52,7 +62,6 @@ table 71179875 NtfyEntryNTSTM
     var
         TempSessionId: Integer;
     begin
-        Commit(); //Need to commit the isolated storage so the background session can read the data
         if not StartSession(TempSessionId, Codeunit::BatchSendNtfysNTSTM, CompanyName, Rec) then
             Codeunit.Run(Codeunit::BatchSendNtfysNTSTM, Rec);