1010using DynamicRepository . Extensions ;
1111using System . Data . Entity ;
1212using System . Linq . Dynamic . Core ;
13+ using System . Threading . Tasks ;
1314
1415namespace DynamicRepository . EF
1516{
@@ -32,6 +33,20 @@ namespace DynamicRepository.EF
3233 /// </summary>
3334 protected internal DbSet < Entity > DbSet ;
3435
36+ /// <summary>
37+ /// Global filter instance set by <see cref="HasGlobalFilter(Expression{Func{Entity, bool}})" />
38+ /// </summary>
39+ private Expression < Func < Entity , bool > > GlobalFilter { get ; set ; }
40+
41+ /// <summary>
42+ /// Adds a global filter expression to all operations which query for data.
43+ /// </summary>
44+ /// <remarks>This method was inspired by "HasQueryFilter" found on EF Core.</remarks>
45+ public void HasGlobalFilter ( Expression < Func < Entity , bool > > filter )
46+ {
47+ GlobalFilter = filter ;
48+ }
49+
3550 /// <summary>
3651 /// Default constructor of main repository.
3752 /// Required dependencies are injected.
@@ -49,30 +64,47 @@ public Repository(DbContext context)
4964 }
5065
5166 /// <summary>
52- /// Returns an instance of non-filtered IQueryable of all items in a DBSet .
67+ /// Gets an entity instance based on its <see cref="Key"/> .
5368 /// </summary>
54- /// <returns>IQueryable instance of type <see cref="Entity"/></returns>
55- internal virtual IQueryable < Entity > List ( )
69+ /// <param name="key">The desired entity key value.</param>
70+ /// <returns>Persisted entity if found, otherwise NULL.</returns>
71+ public virtual Entity Get ( Key key )
5672 {
57- return DbSet ;
73+ Entity queriedEntity ;
74+
75+ if ( key is Array )
76+ {
77+ // This is to handle entity framework find by composite key
78+ queriedEntity = DbSet . Find ( ( key as IEnumerable ) . Cast < object > ( ) . ToArray ( ) ) ;
79+ }
80+ else
81+ {
82+ queriedEntity = DbSet . Find ( key ) ;
83+ }
84+
85+ return GlobalFilter != null ? new [ ] { queriedEntity } . AsQueryable ( ) . FirstOrDefault ( GlobalFilter ) : queriedEntity ;
5886 }
5987
6088 /// <summary>
6189 /// Gets an entity instance based on its <see cref="Key"/>.
6290 /// </summary>
6391 /// <param name="key">The desired entity key value.</param>
6492 /// <returns>Persisted entity if found, otherwise NULL.</returns>
65- public virtual Entity Get ( Key key )
93+ public virtual async Task < Entity > GetAsync ( Key key )
6694 {
95+ Entity queriedEntity ;
96+
6797 if ( key is Array )
6898 {
6999 // This is to handle entity framework find by composite key
70- return DbSet . Find ( ( key as IEnumerable ) . Cast < object > ( ) . ToArray ( ) ) ;
100+ queriedEntity = await DbSet . FindAsync ( ( key as IEnumerable ) . Cast < object > ( ) . ToArray ( ) ) ;
71101 }
72102 else
73103 {
74- return DbSet . Find ( key ) ;
104+ queriedEntity = await DbSet . FindAsync ( key ) ;
75105 }
106+
107+ return GlobalFilter != null ? await new [ ] { queriedEntity } . AsQueryable ( ) . FirstOrDefaultAsync ( GlobalFilter ) : queriedEntity ;
76108 }
77109
78110 /// <summary>
@@ -84,6 +116,15 @@ public virtual void Insert(Entity entity)
84116 DbSet . Add ( entity ) ;
85117 }
86118
119+ /// <summary>
120+ /// Persists a new entity model.
121+ /// </summary>
122+ /// <param name="entity">The new <see cref="Entity"/> instance to be persisted.</param>
123+ public virtual Task InsertAsync ( Entity entity )
124+ {
125+ return Task . Run ( ( ) => DbSet . Add ( entity ) ) ;
126+ }
127+
87128 /// <summary>
88129 /// Updates an existing persisted entity.
89130 /// </summary>
@@ -93,13 +134,31 @@ public virtual void Update(Entity entityToUpdate)
93134 Context . Entry ( entityToUpdate ) . State = EntityState . Modified ;
94135 }
95136
137+ /// <summary>
138+ /// Updates an existing persisted entity.
139+ /// </summary>
140+ /// <param name="entityToUpdate">The <see cref="Entity"/> instance to be updated.</param>
141+ public virtual Task UpdateAsync ( Entity entityToUpdate )
142+ {
143+ return Task . Run ( ( ) => Context . Entry ( entityToUpdate ) . State = EntityState . Modified ) ;
144+ }
145+
96146 /// <summary>
97147 /// Deletes an existing entity.
98148 /// </summary>
99149 /// <param name="id">The primary key of the <see cref="Entity"/> to be deleted.</param>
100150 public virtual void Delete ( Key id )
101151 {
102- Delete ( this . Get ( id ) ) ;
152+ Delete ( Get ( id ) ) ;
153+ }
154+
155+ /// <summary>
156+ /// Deletes an existing entity.
157+ /// </summary>
158+ /// <param name="id">The primary key of the <see cref="Entity"/> to be deleted.</param>
159+ public virtual Task DeleteAsync ( Key id )
160+ {
161+ return Task . Run ( async ( ) => DeleteAsync ( await GetAsync ( id ) ) ) ;
103162 }
104163
105164 /// <summary>
@@ -114,12 +173,34 @@ public void Delete(Entity entityToDelete)
114173 }
115174 }
116175
176+ /// <summary>
177+ /// Deletes an existing entity.
178+ /// </summary>
179+ /// <param name="entityToDelete">The <see cref="Entity"/> instance to be deleted.</param>
180+ public Task DeleteAsync ( Entity entityToDelete )
181+ {
182+ if ( entityToDelete != null )
183+ {
184+ return Task . Run ( ( ) => DbSet . Remove ( entityToDelete ) ) ;
185+ }
186+
187+ return Task . CompletedTask ;
188+ }
189+
117190 /// <summary>
118191 /// Returns all entries of this entity.
119192 /// </summary>
120193 public IEnumerable < Entity > ListAll ( )
121194 {
122- return this . DbSet . ToList ( ) ;
195+ return GetQueryable ( ) ;
196+ }
197+
198+ /// <summary>
199+ /// Gets a queryable instance of the current data set.
200+ /// </summary>
201+ public IQueryable < Entity > GetQueryable ( )
202+ {
203+ return GlobalFilter != null ? DbSet . AsQueryable ( ) . Where ( GlobalFilter ) : DbSet . AsQueryable ( ) ;
123204 }
124205
125206 /// <summary>
@@ -137,7 +218,7 @@ public IEnumerable<Entity> List(
137218 Func < IQueryable < Entity > , IOrderedQueryable < Entity > > orderBy = null ,
138219 params string [ ] includeProperties )
139220 {
140- IQueryable < Entity > query = DbSet ;
221+ IQueryable < Entity > query = GetQueryable ( ) ;
141222
142223 if ( filter != null )
143224 {
@@ -159,25 +240,14 @@ public IEnumerable<Entity> List(
159240 }
160241 }
161242
162- /// <summary>
163- /// Returns <see cref="IQueryable"/> for consumers to shape queries as they need to.
164- /// </summary>
165- /// <returns>
166- /// Plain DbSet as Queryable.
167- /// </returns>
168- protected internal IQueryable < Entity > AsQueryable ( )
169- {
170- return DbSet . AsQueryable ( ) ;
171- }
172-
173243 /// <summary>
174244 /// Returns a collection of data results that can be paged.
175245 /// </summary>
176246 /// <param name="settings">Settings for the search.</param>
177247 /// <returns>Filled PagedData instance.</returns>
178248 public IPagedDataResult < Entity > GetPagedData ( PagedDataSettings settings )
179249 {
180- return _dataSourcePager . GetPagedData ( ( IQueryable < Entity > ) this . List ( ) , settings , this . AddPreConditionsPagedDataFilter ( settings ) , this . AddExtraPagedDataFilter ( settings ) ) ;
250+ return _dataSourcePager . GetPagedData ( GetQueryable ( ) , settings , AddPreConditionsPagedDataFilter ( settings ) , AddExtraPagedDataFilter ( settings ) ) ;
181251 }
182252
183253 /// <summary>
0 commit comments