admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed all lambda experssion variables to z from various where appropriate

Browse Source
This commit is contained in:
John Cardinal
2020-05-18 19:42:42 +00:00
parent 3a359f1052
commit fd8c489914
65 changed files with 431 additions and 557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
server/AyaNova/biz/TranslationBiz.cs
View File

@@ -54,7 +54,7 @@ namespace AyaNova.Biz
return null;
//fetch the existing translation for duplication
var SourceTranslation = await ct.Translation.Include(x => x.TranslationItems).SingleOrDefaultAsync(m => m.Id == inObj.Id);
var SourceTranslation = await ct.Translation.Include(z => z.TranslationItems).SingleOrDefaultAsync(z => z.Id == inObj.Id);
//replicate the source to a new dest and save
Translation NewTranslation = new Translation();
@@ -83,7 +83,7 @@ namespace AyaNova.Biz
internal async Task<Translation> GetAsync(long fetchId)
{
//This is simple so nothing more here, but often will be copying to a different output object or some other ops
return await ct.Translation.Include(x => x.TranslationItems).SingleOrDefaultAsync(m => m.Id == fetchId);
return await ct.Translation.Include(z => z.TranslationItems).SingleOrDefaultAsync(z => z.Id == fetchId);
}
@@ -94,11 +94,11 @@ namespace AyaNova.Biz
List<NameIdItem> l = new List<NameIdItem>();
l = await ct.Translation
.AsNoTracking()
.OrderBy(m => m.Name)
.Select(m => new NameIdItem()
.OrderBy(z => z.Name)
.Select(z => new NameIdItem()
{
Id = m.Id,
Name = m.Name
Id = z.Id,
Name = z.Name
}).ToListAsync();
return l;
@@ -154,7 +154,7 @@ namespace AyaNova.Biz
#if (DEBUG)
TrackRequestedKey(param);
#endif
var ret = await ct.TranslationItem.Where(x => x.TranslationId == UserTranslationId && param.Contains(x.Key)).ToDictionaryAsync(x => x.Key, x => x.Display);
var ret = await ct.TranslationItem.Where(z => z.TranslationId == UserTranslationId && param.Contains(z.Key)).ToDictionaryAsync(z => z.Key, z => z.Display);
return ret.ToList();
}
@@ -168,7 +168,7 @@ namespace AyaNova.Biz
if (!await ct.Translation.AnyAsync(e => e.Id == translationId))
translationId = ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID;
var ret = await ct.TranslationItem.Where(x => x.TranslationId == translationId && param.Contains(x.Key)).AsNoTracking().ToDictionaryAsync(x => x.Key, x => x.Display);
var ret = await ct.TranslationItem.Where(z => z.TranslationId == translationId && param.Contains(z.Key)).AsNoTracking().ToDictionaryAsync(z => z.Key, z => z.Display);
return ret;
}
@@ -178,7 +178,7 @@ namespace AyaNova.Biz
{
if (ct == null)
ct = ServiceProviderProvider.DBContext;
var ret = await ct.Translation.Where(x => x.Id == translationId).AsNoTracking().Select(m => m.CjkIndex).SingleOrDefaultAsync();
var ret = await ct.Translation.Where(z => z.Id == translationId).AsNoTracking().Select(z => z.CjkIndex).SingleOrDefaultAsync();
return ret;
}
@@ -196,14 +196,14 @@ namespace AyaNova.Biz
TrackRequestedKey(key);
#endif
AyContext ct = ServiceProviderProvider.DBContext;
return await ct.TranslationItem.Where(m => m.TranslationId == ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID && m.Key == key).Select(m => m.Display).AsNoTracking().FirstOrDefaultAsync();
return await ct.TranslationItem.Where(z => z.TranslationId == ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID && z.Key == key).Select(z => z.Display).AsNoTracking().FirstOrDefaultAsync();
}
//Get all stock keys that are valid (used for key coverage reporting)
internal static async Task<List<string>> GetKeyListAsync()
{
AyContext ct = ServiceProviderProvider.DBContext;
return await ct.TranslationItem.Where(m => m.TranslationId == 1).OrderBy(m => m.Key).Select(m => m.Key).AsNoTracking().ToListAsync();
return await ct.TranslationItem.Where(z => z.TranslationId == 1).OrderBy(z => z.Key).Select(z => z.Key).AsNoTracking().ToListAsync();
}
@@ -253,7 +253,7 @@ namespace AyaNova.Biz
foreach (NewTextIdConcurrencyTokenItem tit in inObj)
{
var titem = await ct.TranslationItem.SingleOrDefaultAsync(m => m.Id == tit.Id);
var titem = await ct.TranslationItem.SingleOrDefaultAsync(z => z.Id == tit.Id);
if (titem == null)
{
AddError(ApiErrorCode.NOT_FOUND, $"Translation item ID {tit.Id}");
@@ -347,7 +347,7 @@ namespace AyaNova.Biz
AddError(ApiErrorCode.VALIDATION_LENGTH_EXCEEDED, "Name", "255 char max");
//Name must be unique
if (await ct.Translation.AnyAsync(m => m.Name == inObjName))
if (await ct.Translation.AnyAsync(z => z.Name == inObjName))
AddError(ApiErrorCode.VALIDATION_NOT_UNIQUE, "Name");
return;
@@ -387,7 +387,7 @@ namespace AyaNova.Biz
public async Task<long> TranslationNameToIdAsync(string translationName)
{
var v = await ct.Translation.AsNoTracking().FirstOrDefaultAsync(c => c.Name == translationName);
var v = await ct.Translation.AsNoTracking().FirstOrDefaultAsync(z => z.Name == translationName);
if (v == null) return 0;
return v.Id;
}
@@ -398,20 +398,20 @@ namespace AyaNova.Biz
{
ct = ServiceProviderProvider.DBContext;
}
var v = await ct.Translation.AsNoTracking().FirstOrDefaultAsync(c => c.Name == translationName);
var v = await ct.Translation.AsNoTracking().FirstOrDefaultAsync(z => z.Name == translationName);
if (v == null) return ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID;
return v.Id;
}
public async Task<bool> TranslationExistsAsync(string translationName)
{
return await ct.Translation.AnyAsync(c => c.Name == translationName);
return await ct.Translation.AnyAsync(z => z.Name == translationName);
}
public async Task<bool> TranslationExistsAsync(long id)
{
return await ct.Translation.AnyAsync(e => e.Id == id);
return await ct.Translation.AnyAsync(z => z.Id == id);
}
@@ -419,14 +419,14 @@ namespace AyaNova.Biz
//this is only called by Search.cs to cache a local cjk and stopwords, no one else calls it currently
public static async Task<long> ReturnSpecifiedTranslationIdIfExistsOrDefaultTranslationId(long id, AyContext ct)
{
if (!await ct.Translation.AnyAsync(e => e.Id == id))
if (!await ct.Translation.AnyAsync(z => z.Id == id))
return ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID;
return id;
}
public async Task<bool> TranslationItemExistsAsync(long id)
{
return await ct.TranslationItem.AnyAsync(e => e.Id == id);
return await ct.TranslationItem.AnyAsync(z => z.Id == id);
}