From 903dc96eea8ba4c7822fc1fa006df921e5fcfabc Mon Sep 17 00:00:00 2001
From: Ashita Prasad <ashitaprasad92@gmail.com>
Date: Mon, 24 Feb 2025 11:13:11 +0530
Subject: [PATCH] Update insomnia_utils.dart

---
 .../lib/utils/insomnia_utils.dart             | 54 ++++++-------------
 1 file changed, 16 insertions(+), 38 deletions(-)

diff --git a/packages/insomnia_collection/lib/utils/insomnia_utils.dart b/packages/insomnia_collection/lib/utils/insomnia_utils.dart
index c0ab145e..50a1d41a 100644
--- a/packages/insomnia_collection/lib/utils/insomnia_utils.dart
+++ b/packages/insomnia_collection/lib/utils/insomnia_utils.dart
@@ -1,47 +1,25 @@
-
-
-
-import 'package:insomnia_collection/models/insomnia_collection.dart';
-import 'package:insomnia_collection/models/insomnia_environment.dart';
+import '../models/models.dart';
 
 List<(String?, Resource)> getRequestsFromInsomniaCollection(
-    InsomniaCollection? ic) {
-  if (ic == null || ic.resources == null) {
+        InsomniaCollection? ic) =>
+    getItemByTypeFromInsomniaCollection(ic, ResourceType.request.name);
+
+List<(String?, Resource)> getEnvironmentsFromInsomniaCollection(
+        InsomniaCollection? ic) =>
+    getItemByTypeFromInsomniaCollection(ic, ResourceType.environment.name);
+
+List<(String?, Resource)> getItemByTypeFromInsomniaCollection(
+  InsomniaCollection? ic,
+  String type,
+) {
+  if (ic?.resources == null || ic!.resources!.length > 0) {
     return [];
   }
   List<(String?, Resource)> requests = [];
-  if (ic.resources!.length > 0) {
-    for (var i in ic.resources!) {
-      requests.addAll(getRequestsFromInsomniaResource(i));
+  for (var item in ic.resources!) {
+    if (item.type != null || item.type == type) {
+      requests.add((item.name, item));
     }
   }
   return requests;
 }
-
-List<EnvironmentVariable> getEnvironmentVariablesFromInsomniaEnvironment(
-    InsomniaEnvironment? ev) {
-  if (ev == null || ev.resources == null) {
-    return [];
-  }
-  List<EnvironmentVariable> envVariables = [];
-  if (ev.resources!.length > 0) {
-    for (var envvar in ev.resources!) {
-      envVariables.add(envvar);
-    }
-  }
-  return envVariables;
-}
-
-List<(String?, Resource)> getRequestsFromInsomniaResource(Resource? resource) {
-  if (resource == null) {
-    return [];
-  }
-  List<(String?, Resource)> requests = [];
-  if (resource.type != null || resource.type == 'request') {
-    requests.add((resource.name, resource));
-  } else {
-    print('Resource type is not request');
-  }
-  return requests;
-}
-