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

Browse Source
This commit is contained in:
John Cardinal
2020-11-19 22:17:30 +00:00
parent bae2cc3519
commit 3826d37174
2 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/AyaNova/Controllers/TranslationController.cs
View File

@@ -189,7 +189,7 @@ namespace AyaNova.Api.Controllers
{ {
if (serverState.IsClosed) if (serverState.IsClosed)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
var l = await TranslationBiz.GetSubsetStaticAsync(inObj, id); var l = await TranslationBiz.GetSpecifiedTranslationSubsetStaticAsync(inObj, id);
return Ok(ApiOkResponse.Response(l)); return Ok(ApiOkResponse.Response(l));
} }

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

@@ -246,19 +246,47 @@ namespace AyaNova.Biz
#endif #endif
//Get the keys for a list of keys provided /////////////////////////////////////////////////////////////////
// Get subset for currently logged in user's translation id
// Standard used by translationcontroller for logged in user
//
//
internal async Task<List<KeyValuePair<string, string>>> GetSubsetAsync(List<string> param) internal async Task<List<KeyValuePair<string, string>>> GetSubsetAsync(List<string> param)
{ {
#if (DEBUG) #if (DEBUG)
TrackRequestedKey(param); TrackRequestedKey(param);
#endif #endif
var ret = await ct.TranslationItem.Where(z => z.TranslationId == UserTranslationId && param.Contains(z.Key)).ToDictionaryAsync(z => z.Key, z => z.Display); var ret = await ct.TranslationItem.Where(z => z.TranslationId == UserTranslationId && param.Contains(z.Key)).AsNoTracking().ToDictionaryAsync(z => z.Key, z => z.Display);
return ret.ToList(); return ret.ToList();
} }
//Get the keys for a list of keys provided, static format for calling from other internal classes /////////////////////////////////////////////////////////////////
//and remotely when fetching for things like Password reset where the user isn't logged in yet but we know their translation id // Get subset for specified translation ID
// called from controller and Used when user is not logged in
// e.g. when resetting their password
//
internal static async Task<List<KeyValuePair<string, string>>> GetSpecifiedTranslationSubsetStaticAsync(List<string> param, long translationId)
{
#if (DEBUG)
TrackRequestedKey(param);
#endif
using (AyContext ct = ServiceProviderProvider.DBContext)
{
if (!await ct.Translation.AnyAsync(e => e.Id == translationId))
translationId = ServerBootConfig.AYANOVA_DEFAULT_TRANSLATION_ID;
var ret = await ct.TranslationItem.Where(z => z.TranslationId == translationId && param.Contains(z.Key)).AsNoTracking().ToDictionaryAsync(z => z.Key, z => z.Display);
return ret.ToList();
}
}
/////////////////////////////////////////////////////////////////
// Get subset for specified translation ID statically
// called from internal code differs from
// GetSpecifiedTranslationSubsetStaticAsync above only in return signature
// and used for internal classes to call
//
internal static async Task<Dictionary<string, string>> GetSubsetStaticAsync(List<string> param, long translationId) internal static async Task<Dictionary<string, string>> GetSubsetStaticAsync(List<string> param, long translationId)
{ {
#if (DEBUG) #if (DEBUG)