Issue #144

Fix Remove-DSClientScheduleDetail and Remove-DSClientTimeRetentionOption retrieving details from DSClientSessionInfo
McGlovin1337 · Nov 4, 2021 · 6181012 · 6181012
1 parent b5166d3
commit 6181012
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 16 deletions.
diff --git a/PSAsigraDSClient/RemoveDSClientScheduleDetail.cs b/PSAsigraDSClient/RemoveDSClientScheduleDetail.cs
@@ -28,22 +28,31 @@ protected override void DSClientProcessRecord()
             Schedule schedule = DSClientScheduleMgr.definedSchedule(ScheduleId);
 
             // Get Schedule Detail Hash Dictionary from SessionState
-            Dictionary<string, int> detailHashes = SessionState.PSVariable.GetValue("ScheduleDetail", null) as Dictionary<string, int>;
+            Dictionary<string, int> detailHashes = DSClientSessionInfo.GetScheduleOrRetentionDictionary(true);
             if (detailHashes == null)
-                throw new Exception("No Schedule Details found in Session State, use Get-DSClientScheduleDetail Cmdlet");
-
-            // Select the Schedule Detail
-            (ScheduleDetail scheduleDetail, string detailHash) = SelectScheduleDetail(schedule, DetailId, detailHashes);
-
-            if (scheduleDetail != null)
-                if (ShouldProcess($"Schedule: '{schedule.getName()}'", $"Remove {EnumToString(scheduleDetail.getType())} Schedule Detail with Id '{DetailId}'"))
-                    schedule.removeDetail(scheduleDetail);
-
-            // Remove the Hash from SessionState Dictionary
-            detailHashes.Remove(detailHash);
-            SessionState.PSVariable.Set("ScheduleDetail", detailHashes);
-
-            schedule.Dispose();
+            {
+                ErrorRecord errorRecord = new ErrorRecord(
+                    new Exception("No Schedule Details found in Session State, use Get-DSClientScheduleDetail Cmdlet"),
+                    "Exception",
+                    ErrorCategory.ObjectNotFound,
+                    null);
+                WriteError(errorRecord);
+            }
+            else
+            {
+                // Select the Schedule Detail
+                (ScheduleDetail scheduleDetail, string detailHash) = SelectScheduleDetail(schedule, DetailId, detailHashes);
+
+                if (scheduleDetail != null)
+                    if (ShouldProcess($"Schedule: '{schedule.getName()}'", $"Remove {EnumToString(scheduleDetail.getType())} Schedule Detail with Id '{DetailId}'"))
+                        schedule.removeDetail(scheduleDetail);
+
+                // Remove the Hash from SessionState Dictionary
+                detailHashes.Remove(detailHash);
+                SessionState.PSVariable.Set("ScheduleDetail", detailHashes);
+
+                schedule.Dispose();
+            }
         }
     }
 }
diff --git a/PSAsigraDSClient/RemoveDSClientTimeRetentionOption.cs b/PSAsigraDSClient/RemoveDSClientTimeRetentionOption.cs
@@ -23,7 +23,8 @@ protected override void ProcessRetentionRule(RetentionRule[] retentionRules)
             RetentionRule retentionRule = retentionRules.Single(rule => rule.getID() == RetentionRuleId);
 
             // Get Time Retention Option Hash Dictionary from Session State
-            if (!(SessionState.PSVariable.GetValue("TimeRetention", null) is Dictionary<string, int> retentionHash))
+            Dictionary<string, int> retentionHash = DSClientSessionInfo.GetScheduleOrRetentionDictionary(false);
+            if (retentionHash == null)
             {
                 ErrorRecord errorRecord = new ErrorRecord(
                     new Exception("There are no Time Retention Options Stored in Session State, use Get-DSClientTimeRetentionOption"),