Add OnAfterLoad handling to Repository.

RickStrahl · Jan 30, 2017 · 31ab303 · 31ab303
1 parent 95cd233
commit 31ab303
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 30 deletions.
diff --git a/src/AlbumViewerBusiness/AlbumRepository.cs b/src/AlbumViewerBusiness/AlbumRepository.cs
@@ -16,7 +16,7 @@ public AlbumRepository(AlbumViewerContext context)
             : base(context)
         { }
 
-
+                
         /// <summary>
         /// Loads and individual album.
         /// 
@@ -25,31 +25,34 @@ public AlbumRepository(AlbumViewerContext context)
         /// </summary>
         /// <param name="objId">Album Id</param>
         /// <returns></returns>
-public override async Task<Album> Load(object albumId)
-{                        
-    Album album = null;
-    try
-    {
-        int id = (int) albumId;
-        album = await Context.Albums
-            .Include(ctx => ctx.Tracks)
-            .Include(ctx => ctx.Artist)
-            .FirstOrDefaultAsync(alb => alb.Id == id);
-    }
-    catch (InvalidOperationException)
-    {
-        // Handles errors where an invalid Id was passed, but SQL is valid                
-        SetError("Couldn't load album - invalid album id specified.");
-        return null;
-    }
-    catch (Exception ex)
-    {
-        // handles Sql errors                                
-        SetError(ex);
-    }
+        public override async Task<Album> Load(object albumId)
+        {                        
+            Album album = null;
+            try
+            {
+                int id = (int) albumId;
+                album = await Context.Albums
+                    .Include(ctx => ctx.Tracks)
+                    .Include(ctx => ctx.Artist)
+                    .FirstOrDefaultAsync(alb => alb.Id == id);
+
+                if (album != null)
+                    OnAfterLoaded(album);
+            }
+            catch (InvalidOperationException)
+            {
+                // Handles errors where an invalid Id was passed, but SQL is valid                
+                SetError("Couldn't load album - invalid album id specified.");
+                return null;
+            }
+            catch (Exception ex)
+            {
+                // handles Sql errors                                
+                SetError(ex);
+            }
 
-    return album;
-}
+            return album;
+        }
 
 
 

diff --git a/src/AlbumViewerBusiness/Westwind.BusinessObjects/EntityFrameworkRepository.cs b/src/AlbumViewerBusiness/Westwind.BusinessObjects/EntityFrameworkRepository.cs
@@ -235,11 +235,7 @@ protected virtual async Task<TEntity> LoadBase(Expression<Func<TEntity, bool>> w
             {                
                 var entity = await DbSet.FirstOrDefaultAsync(whereClauseLambda);
 
-                if (entity != null)
-                    OnAfterLoaded(entity);
-                else
-                    SetError("Unable to find matching entity.");
-
+
                 return entity;
             }
             catch (InvalidOperationException)