refactor: Create properties such as NotExists and IsNotOptional (#181)

MrDave1999 · Jun 28, 2024 · b45f5cd · b45f5cd
1 parent 84b6696
commit b45f5cd
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/Loader/EnvFile.cs b/src/Loader/EnvFile.cs
@@ -24,8 +24,18 @@ internal class EnvFile
     /// </summary>
     public bool Exists { get; set; } = true;
 
+    /// <summary>
+    /// Checks if the .env file does not exist.
+    /// </summary>
+    public bool NotExists => !Exists;
+
     /// <summary>
     /// A value indicating whether the existence of the .env file is optional or not.
     /// </summary>
     public bool Optional { get; set; }
+
+    /// <summary>
+    /// Checks if the .env file is not optional.
+    /// </summary>
+    public bool IsNotOptional => !Optional;
 }
diff --git a/src/Loader/EnvLoader.HelperMethods.cs b/src/Loader/EnvLoader.HelperMethods.cs
@@ -19,7 +19,7 @@ private void StartFileLoading(EnvFile envFile)
         envFile.Path       = Path.Combine(_configuration.BasePath, envFile.Path);
         envFile.Exists     = ReadFileContents(envFile);
 
-        if (!envFile.Exists && !envFile.Optional)
+        if (envFile.NotExists && envFile.IsNotOptional)
             _validationResult.Add(errorMsg: string.Format(FileNotFoundMessage, envFile.Path));
     }
 

diff --git a/src/Loader/EnvLoader.cs b/src/Loader/EnvLoader.cs
@@ -85,7 +85,7 @@ public IEnvironmentVariablesProvider LoadEnv(out EnvValidationResult result)
             var envLocal = envFiles[2];
             // Defines the default environment.
             Env.CurrentEnvironment = EnvironmentNames.Development[0];
-            if (!envDevelopmentLocal.Exists && !envDevLocal.Exists && !envLocal.Exists)
+            if (envDevelopmentLocal.NotExists && envDevLocal.NotExists && envLocal.NotExists)
                 _validationResult.Add(errorMsg: FormatLocalFileNotPresentMessage());
         }
         else
@@ -94,7 +94,7 @@ public IEnvironmentVariablesProvider LoadEnv(out EnvValidationResult result)
             var envEnvironmentLocal = envFiles[0];
             // .env.local
             var envLocal = envFiles[1];
-            if (!envEnvironmentLocal.Exists && !envLocal.Exists)
+            if (envEnvironmentLocal.NotExists && envLocal.NotExists)
                 _validationResult.Add(errorMsg: FormatLocalFileNotPresentMessage(environmentName: environment));
         }