fix: error message format

UNOPS · Jul 11, 2018 · da374cd · da374cd
1 parent e8cbcf0
commit da374cd
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 18 deletions.
diff --git a/Filer.EntityFrameworkCore/Extensions.cs b/Filer.EntityFrameworkCore/Extensions.cs
@@ -2,6 +2,10 @@ namespace Filer.EntityFrameworkCore
 {
 	using System;
 	using System.Collections.Generic;
+	using System.Linq;
+	using System.Threading.Tasks;
+	using Filer.Core;
+	using Microsoft.EntityFrameworkCore;
 
 	public static class Extensions
 	{
@@ -18,5 +22,29 @@ public static IEnumerable<TSource> DistinctBy<TSource, TKey>(
 				}
 			}
 		}
+
+		internal static File SingleOrException(this IQueryable<File> source, int fileId)
+		{
+			var file = source.SingleOrDefault(t => t.Id == fileId);
+
+			if (file == null)
+			{
+				throw new NullReferenceException($"File #{fileId} does not exist.");
+			}
+
+			return file;
+		}
+
+		internal static async Task<File> SingleOrExceptionAsync(this IQueryable<File> source, int fileId)
+		{
+			var file = await source.SingleOrDefaultAsync(t => t.Id == fileId);
+
+			if (file == null)
+			{
+				throw new NullReferenceException($"File #{fileId} does not exist.");
+			}
+
+			return file;
+		}
 	}
 }
diff --git a/Filer.EntityFrameworkCore/FileManager.cs b/Filer.EntityFrameworkCore/FileManager.cs
@@ -85,12 +85,7 @@ public async Task AttachFileToContextsAsync(int fileId, params string[] contexts
 		{
 			var file = await this.dbContext.Files
 				.Include(t => t.Contexts)
-				.SingleOrDefaultAsync(t => t.Id == fileId);
-
-			if (file == null)
-			{
-				throw new NullReferenceException($"File [id:{fileId}] does not exists");
-			}
+				.SingleOrExceptionAsync(fileId);
 
 			foreach (var context in contexts)
 			{
@@ -173,12 +168,7 @@ public void DetachFileFromContexts(int fileId, params string[] contexts)
 		{
 			var file = this.dbContext.Files
 				.Include(t => t.Contexts)
-				.SingleOrDefault(t => t.Id == fileId);
-
-			if (file == null)
-			{
-				throw new NullReferenceException($"File [id:{fileId}] does not exists");
-			}
+				.SingleOrException(fileId);
 
 			foreach (var context in contexts)
 			{
@@ -223,12 +213,7 @@ public void AttachFileToContexts(int fileId, params string[] contexts)
 		{
 			var file = this.dbContext.Files
 				.Include(t => t.Contexts)
-				.SingleOrDefault(t => t.Id == fileId);
-
-			if (file == null)
-			{
-				throw new NullReferenceException($"File [id:{fileId}] does not exists");
-			}
+				.SingleOrException(fileId);
 
 			foreach (var context in contexts)
 			{