Removed unused readOnly property on return response

This commit is contained in:
2020-05-18 16:25:08 +00:00
parent eacf8eb7aa
commit 07390b6a31
42 changed files with 126 additions and 125 deletions

View File

@@ -1,7 +1,6 @@
PRIORITY - ALWAYS Lowest level stuff first
=-=-=-=-
todo:aycontext clean up old block of weird definitions
todo: apiokresponse returns readonly value every time, but I check it anyway at the client and biz object itself doesn't set it I don't think, so...should it be removed?
todo: Is there a log that records past jobs, how long can they be viewed?
todo: Rename the link to AyaNova App on the server page to just "AyaNova"

View File

@@ -5,22 +5,24 @@ namespace AyaNova.Api.ControllerHelpers
//return the response with optional readonly flag
//this exists basically for consistency and to reduce the bandwidth if not readonly which is most common
//UPDATE: Actually, there's no way for the biz object to set the readonly status and the client doesn't really use it at this point 2020-05-18 09:09:29
//in theory it should be a non db property of the model if it's going to be used at all so removing it entirely from response as a separate property
public static class ApiOkResponse
{
public static object Response(object result, bool isReadOnly)
public static object Response(object result)
{
if (isReadOnly)
{
return new
{
Data = result,
ReadOnly = true
};
}
else
{
// if (isReadOnly)
// {
// return new
// {
// Data = result,
// ReadOnly = true
// };
// }
// else
// {
return new { Data = result };
}
//}
}
}//eoc

View File

@@ -136,7 +136,7 @@ namespace AyaNova.Api.Controllers
//Normallyh wouldn't return a whole list but in this case the UI demands it because of reactivity issues
var ret = await GetFileListForObjectAsync(dbObj.AttachToObjectType, dbObj.AttachToObjectId);
return Ok(ApiOkResponse.Response(ret, true));
return Ok(ApiOkResponse.Response(ret));
}
@@ -162,7 +162,7 @@ namespace AyaNova.Api.Controllers
if (!ModelState.IsValid)
return BadRequest(new ApiErrorResponse(ModelState));
var ret = await GetFileListForObjectAsync(ayaType, ayaId);
return Ok(ApiOkResponse.Response(ret, true));
return Ok(ApiOkResponse.Response(ret));
}
@@ -333,7 +333,7 @@ namespace AyaNova.Api.Controllers
}
//Return the list of attachment ids and filenames
return Ok(ApiOkResponse.Response(ret, false));
return Ok(ApiOkResponse.Response(ret));
}
/// <summary>

View File

@@ -140,7 +140,7 @@ namespace AyaNova.Api.Controllers
token = TestToken,
name = "Manager Account - TESTING",
roles = "0"
}, true));
}));
}
@@ -223,7 +223,7 @@ namespace AyaNova.Api.Controllers
usertype = u.UserType,
roles = ((int)u.Roles).ToString(),
dlt = DownloadToken
}, true));
}));
}
}

View File

@@ -54,9 +54,9 @@ namespace AyaNova.Api.Controllers
//as json for client end of things
if (AsJson)
return Ok(ApiOkResponse.Response(Newtonsoft.Json.JsonConvert.SerializeObject(BizRoles.roles, Newtonsoft.Json.Formatting.None), true));
return Ok(ApiOkResponse.Response(Newtonsoft.Json.JsonConvert.SerializeObject(BizRoles.roles, Newtonsoft.Json.Formatting.None)));
else
return Ok(ApiOkResponse.Response(BizRoles.roles, true));
return Ok(ApiOkResponse.Response(BizRoles.roles));
}

View File

@@ -99,7 +99,7 @@ namespace AyaNova.Api.Controllers
return BadRequest(new ApiErrorResponse(ModelState));
var o = await biz.GetAsync(id);
if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType)));
return Ok(ApiOkResponse.Response(o));
}
/// <summary>
@@ -125,7 +125,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));;
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));;
}
/// <summary>

View File

@@ -99,7 +99,7 @@ namespace AyaNova.Api.Controllers
return BadRequest(new ApiErrorResponse(ModelState));
var o = await biz.GetAsync(id);
if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType)));
return Ok(ApiOkResponse.Response(o));
}
/// <summary>
@@ -125,7 +125,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));;
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));;
}
/// <summary>

View File

@@ -97,7 +97,7 @@ namespace AyaNova.Api.Controllers
if (!serverState.IsOpen)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
return Ok(ApiOkResponse.Response(DataListFactory.GetListOfAllDataListKeyNames(), true));
return Ok(ApiOkResponse.Response(DataListFactory.GetListOfAllDataListKeyNames()));
}
@@ -118,7 +118,7 @@ namespace AyaNova.Api.Controllers
return BadRequest(new ApiErrorResponse(ApiErrorCode.NOT_FOUND, "DataListKey", $"DataList \"{DataListKey}\" specified does not exist"));
}
return Ok(ApiOkResponse.Response(DataList.FieldDefinitions, true));
return Ok(ApiOkResponse.Response(DataList.FieldDefinitions));
}
}//eoc

View File

@@ -69,7 +69,7 @@ namespace AyaNova.Api.Controllers
if (o == null)
return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType)));
return Ok(ApiOkResponse.Response(o));
}
@@ -91,7 +91,7 @@ namespace AyaNova.Api.Controllers
DataListViewBiz biz = DataListViewBiz.GetBiz(ct, HttpContext);
var l = await biz.GetViewListAsync(ListKey);
return Ok(ApiOkResponse.Response(l, true));
return Ok(ApiOkResponse.Response(l));
}
@@ -133,7 +133,7 @@ namespace AyaNova.Api.Controllers
else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));
}
@@ -257,7 +257,7 @@ namespace AyaNova.Api.Controllers
if (o == null)
return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o.DefaultListView, true));
return Ok(ApiOkResponse.Response(o.DefaultListView));
}

View File

@@ -200,7 +200,7 @@ namespace AyaNova.Api.Controllers
return Ok(ApiOkResponse.Response(ReturnList, true));
return Ok(ApiOkResponse.Response(ReturnList));
}
@@ -223,7 +223,7 @@ namespace AyaNova.Api.Controllers
ret.Add(new KeyValuePair<string, string>("Core", "All Core AyaNova business object types"));
ret.Add(new KeyValuePair<string, string>(StringUtil.TrimTypeName(typeof(UiFieldDataType).ToString()), "Types of data used in AyaNova for display and formatting UI purposes"));
return Ok(ApiOkResponse.Response(ret, true));
return Ok(ApiOkResponse.Response(ret));
}

View File

@@ -65,7 +65,7 @@ namespace AyaNova.Api.Controllers
return BadRequest(new ApiErrorResponse(ModelState));
var ret = await EventLogProcessor.GetLogForObjectAsync(opt, ct);
return Ok(ApiOkResponse.Response(ret, true));
return Ok(ApiOkResponse.Response(ret));
}
@@ -95,7 +95,7 @@ namespace AyaNova.Api.Controllers
}
var ret = await EventLogProcessor.GetLogForUserAsync(opt, ct);
return Ok(ApiOkResponse.Response(ret, true));
return Ok(ApiOkResponse.Response(ret));
}

View File

@@ -84,7 +84,7 @@ namespace AyaNova.Api.Controllers
}
}
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType)));
return Ok(ApiOkResponse.Response(o));
}
@@ -112,7 +112,7 @@ namespace AyaNova.Api.Controllers
if (!ModelState.IsValid)
return BadRequest(new ApiErrorResponse(ModelState));
return Ok(ApiOkResponse.Response(CustomFieldType.ValidCustomFieldTypes, true));
return Ok(ApiOkResponse.Response(CustomFieldType.ValidCustomFieldTypes));
}
@@ -132,7 +132,7 @@ namespace AyaNova.Api.Controllers
if (!ModelState.IsValid)
return BadRequest(new ApiErrorResponse(ModelState));
return Ok(ApiOkResponse.Response(AyaFormFieldDefinitions.AyaFormFieldDefinitionKeys, true));
return Ok(ApiOkResponse.Response(AyaFormFieldDefinitions.AyaFormFieldDefinitionKeys));
}
@@ -175,7 +175,7 @@ namespace AyaNova.Api.Controllers
else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));
}

View File

@@ -54,7 +54,7 @@ namespace AyaNova.Api.Controllers
if (AyaFormFieldDefinitions.IsValidFormFieldDefinitionKey(FormFieldDefinitionKey))
{
return Ok(ApiOkResponse.Response(AyaFormFieldDefinitions.AyaFormFields(FormFieldDefinitionKey), true));
return Ok(ApiOkResponse.Response(AyaFormFieldDefinitions.AyaFormFields(FormFieldDefinitionKey)));
}
else
{

View File

@@ -60,7 +60,7 @@ namespace AyaNova.Api.Controllers
if (o == null)
return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType)));
return Ok(ApiOkResponse.Response(o));
}
@@ -126,7 +126,7 @@ namespace AyaNova.Api.Controllers
SearchCaseSensitiveOnly = AyaNova.Util.ServerGlobalBizSettings.SearchCaseSensitiveOnly
};
return Ok(ApiOkResponse.Response(ret, true));
return Ok(ApiOkResponse.Response(ret));
}
}//eoc

View File

@@ -99,7 +99,7 @@ namespace AyaNova.Api.Controllers
return BadRequest(new ApiErrorResponse(ModelState));
var o = await biz.GetAsync(id);
if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType)));
return Ok(ApiOkResponse.Response(o));
}
/// <summary>
@@ -125,7 +125,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));;
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));;
}
/// <summary>

View File

@@ -70,7 +70,7 @@ namespace AyaNova.Api.Controllers
JobOperationsBiz biz = new JobOperationsBiz(ct, UserIdFromContext.Id(HttpContext.Items), UserRolesFromContext.Roles(HttpContext.Items));
List<JobOperationsFetchInfo> l = await biz.GetJobListAsync();
return Ok(ApiOkResponse.Response(l, true));
return Ok(ApiOkResponse.Response(l));
}
@@ -101,7 +101,7 @@ namespace AyaNova.Api.Controllers
JobOperationsBiz biz = new JobOperationsBiz(ct, UserIdFromContext.Id(HttpContext.Items), UserRolesFromContext.Roles(HttpContext.Items));
List<JobOperationsLogInfoItem> l = await biz.GetJobLogListAsync(gid);
return Ok(ApiOkResponse.Response(l, true));
return Ok(ApiOkResponse.Response(l));
}

View File

@@ -64,7 +64,7 @@ namespace AyaNova.Api.Controllers
var ret = AyaNova.Core.License.LicenseInfoAsJson;
return Ok(ApiOkResponse.Response(ret, true));
return Ok(ApiOkResponse.Response(ret));
}
@@ -80,7 +80,7 @@ namespace AyaNova.Api.Controllers
//note: this route is called by the client as the first action so it also acts like a ping to see if the server is up as well
if (serverState.IsClosed)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
return Ok(ApiOkResponse.Response(AyaNova.Core.License.ActiveKey.TrialLicense, true));
return Ok(ApiOkResponse.Response(AyaNova.Core.License.ActiveKey.TrialLicense));
}
@@ -135,7 +135,7 @@ namespace AyaNova.Api.Controllers
//Log
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.License, AyaEvent.LicenseFetch), ct);
return Ok(ApiOkResponse.Response(ret, true));
return Ok(ApiOkResponse.Response(ret));
}
@@ -180,7 +180,7 @@ namespace AyaNova.Api.Controllers
//Log
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.License, AyaEvent.LicenseTrialRequest), ct);
return Ok(ApiOkResponse.Response(ret, true));
return Ok(ApiOkResponse.Response(ret));
}

View File

@@ -99,7 +99,7 @@ namespace AyaNova.Api.Controllers
return BadRequest(new ApiErrorResponse(ModelState));
var o = await biz.GetAsync(id);
if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType)));
return Ok(ApiOkResponse.Response(o));
}
/// <summary>
@@ -125,7 +125,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));;
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));;
}
/// <summary>

View File

@@ -123,7 +123,7 @@ namespace AyaNova.Api.Controllers
return Ok(ApiOkResponse.Response(o, true));
return Ok(ApiOkResponse.Response(o));
}

View File

@@ -90,7 +90,7 @@ namespace AyaNova.Api.Controllers
//Log
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.Metrics, AyaEvent.Retrieved), ct);
return Ok(ApiOkResponse.Response(json, true));
return Ok(ApiOkResponse.Response(json));
}
/// <summary>

View File

@@ -46,7 +46,7 @@ namespace AyaNova.Api.Controllers
//note: this route is called by the client as the first action so it also acts like a ping to see if the server is up as well
if (serverState.IsClosed)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
return Ok(ApiOkResponse.Response(!AyaNova.Core.License.ActiveKey.TrialLicense, true));
return Ok(ApiOkResponse.Response(!AyaNova.Core.License.ActiveKey.TrialLicense));
}
@@ -61,7 +61,7 @@ namespace AyaNova.Api.Controllers
//STUB: https://rockfish.ayanova.com/default.htm#!/rfcaseEdit/3783
if (serverState.IsClosed)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
return Ok(ApiOkResponse.Response(69, true));
return Ok(ApiOkResponse.Response(69));
}
//TODO: See new count case for gist of it

View File

@@ -67,7 +67,7 @@ namespace AyaNova.Api.Controllers
// NOTE: HERE would be the second check of biz rules before returning the object
// in cases where there is also a business rule to affect retrieval on top of basic rights
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType)));
return Ok(ApiOkResponse.Response(o));
}
@@ -109,7 +109,7 @@ namespace AyaNova.Api.Controllers
else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));
}

View File

@@ -99,7 +99,7 @@ namespace AyaNova.Api.Controllers
return BadRequest(new ApiErrorResponse(ModelState));
var o = await biz.GetAsync(id);
if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType)));
return Ok(ApiOkResponse.Response(o));
}
/// <summary>
@@ -125,7 +125,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));;
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));;
}
/// <summary>

View File

@@ -99,7 +99,7 @@ namespace AyaNova.Api.Controllers
return BadRequest(new ApiErrorResponse(ModelState));
var o = await biz.GetAsync(id);
if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType)));
return Ok(ApiOkResponse.Response(o));
}
/// <summary>
@@ -125,7 +125,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));;
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));;
}
/// <summary>

View File

@@ -87,7 +87,7 @@ namespace AyaNova.Api.Controllers
if (o == null)
return BadRequest(new ApiErrorResponse(biz.Errors));
else
return Ok(ApiOkResponse.Response(o, true));
return Ok(ApiOkResponse.Response(o));
}
@@ -116,7 +116,7 @@ namespace AyaNova.Api.Controllers
if (o == null)
return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType)));
return Ok(ApiOkResponse.Response(o));
}
@@ -139,7 +139,7 @@ namespace AyaNova.Api.Controllers
if (o == null)
return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, true));
return Ok(ApiOkResponse.Response(o));
}
@@ -231,7 +231,7 @@ namespace AyaNova.Api.Controllers
{
return BadRequest(new ApiErrorResponse(ApiErrorCode.NOT_FOUND, "ayatype", $"PickList for type \"{ayaType.ToString()}\" not supported"));
}
return Ok(ApiOkResponse.Response(PickList.ColumnDefinitions, true));
return Ok(ApiOkResponse.Response(PickList.ColumnDefinitions));
}

View File

@@ -99,7 +99,7 @@ namespace AyaNova.Api.Controllers
return BadRequest(new ApiErrorResponse(ModelState));
var o = await biz.GetAsync(id);
if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType)));
return Ok(ApiOkResponse.Response(o));
}
/// <summary>
@@ -125,7 +125,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));;
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));;
}
/// <summary>

View File

@@ -99,7 +99,7 @@ namespace AyaNova.Api.Controllers
return BadRequest(new ApiErrorResponse(ModelState));
var o = await biz.GetAsync(id);
if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType)));
return Ok(ApiOkResponse.Response(o));
}
/// <summary>
@@ -125,7 +125,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));;
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));;
}
/// <summary>

View File

@@ -67,7 +67,7 @@ namespace AyaNova.Api.Controllers
// NOTE: HERE would be the second check of biz rules before returning the object
// in cases where there is also a business rule to affect retrieval on top of basic rights
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType)));
return Ok(ApiOkResponse.Response(o));
}
@@ -109,7 +109,7 @@ namespace AyaNova.Api.Controllers
else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));
}

View File

@@ -68,7 +68,7 @@ namespace AyaNova.Api.Controllers
// NOTE: HERE would be the second check of biz rules before returning the object
// in cases where there is also a business rule to affect retrieval on top of basic rights
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType)));
return Ok(ApiOkResponse.Response(o));
}
@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));
}

View File

@@ -66,7 +66,7 @@ namespace AyaNova.Api.Controllers
//Do the search
var SearchResults = await Search.DoSearchAsync(ct, UserTranslationIdFromContext.Id(HttpContext.Items), UserRolesFromContext.Roles(HttpContext.Items), searchParams);
return Ok(ApiOkResponse.Response(SearchResults, true));
return Ok(ApiOkResponse.Response(SearchResults));
}
/// <summary>
@@ -96,7 +96,7 @@ namespace AyaNova.Api.Controllers
var res = await Search.GetInfoAsync(ct, UserTranslationIdFromContext.Id(HttpContext.Items),
UserRolesFromContext.Roles(HttpContext.Items), UserIdFromContext.Id(HttpContext.Items), phrase, max, ayaType, id);
return Ok(ApiOkResponse.Response(res, true));
return Ok(ApiOkResponse.Response(res));
}
@@ -133,8 +133,8 @@ namespace AyaNova.Api.Controllers
case AyaType.WorkOrderItemScheduledUser:
case AyaType.WorkOrderItemTask:
case AyaType.WorkOrderItemTravel:
AyaTypeId TypeId=await WorkOrderBiz.GetAncestor(ayaType, id, ct);
return Ok(ApiOkResponse.Response(new {AyaType=TypeId.ObjectTypeAsInt,Id=TypeId.ObjectId}, true));
AyaTypeId TypeId = await WorkOrderBiz.GetAncestor(ayaType, id, ct);
return Ok(ApiOkResponse.Response(new { AyaType = TypeId.ObjectTypeAsInt, Id = TypeId.ObjectId }));
default:
return BadRequest(new ApiErrorResponse(ApiErrorCode.VALIDATION_INVALID_VALUE, "ayaType", "Only types with ancestors are valid"));

View File

@@ -47,7 +47,7 @@ namespace AyaNova.Api.Controllers
[HttpGet]
public ActionResult Get()
{
return Ok(ApiOkResponse.Response(new ServerStateModel() { ServerState = serverState.GetState().ToString(), Reason = serverState.Reason }, !Authorized.HasModifyRole(HttpContext.Items, AyaType.ServerState)));
return Ok(ApiOkResponse.Response(new ServerStateModel() { ServerState = serverState.GetState().ToString(), Reason = serverState.Reason }));
}
@@ -86,7 +86,7 @@ namespace AyaNova.Api.Controllers
//Log
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserIdFromContext.Id(HttpContext.Items), 0, AyaType.ServerState, AyaEvent.ServerStateChange, $"{state.ServerState}-{state.Reason}"), ct);
return Ok(ApiOkResponse.Response(new ServerStateModel() { ServerState = serverState.GetState().ToString(), Reason = serverState.Reason }, false));
return Ok(ApiOkResponse.Response(new ServerStateModel() { ServerState = serverState.GetState().ToString(), Reason = serverState.Reason }));
}

View File

@@ -53,7 +53,7 @@ namespace AyaNova.Api.Controllers
{
if (serverState.IsClosed)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
return Ok(ApiOkResponse.Response(await TagBiz.TagListFilteredAsync(ct, query), true));
return Ok(ApiOkResponse.Response(await TagBiz.TagListFilteredAsync(ct, query)));
}
/// <summary>
@@ -66,7 +66,7 @@ namespace AyaNova.Api.Controllers
{
if (serverState.IsClosed)
return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason));
return Ok(ApiOkResponse.Response(await TagBiz.CloudListFilteredAsync(ct, query), true));
return Ok(ApiOkResponse.Response(await TagBiz.CloudListFilteredAsync(ct, query)));
}

View File

@@ -78,7 +78,7 @@ namespace AyaNova.Api.Controllers
return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
}
return Ok(ApiOkResponse.Response(o, true));
return Ok(ApiOkResponse.Response(o));
}
@@ -97,7 +97,7 @@ namespace AyaNova.Api.Controllers
TranslationBiz biz = TranslationBiz.GetBiz(ct, HttpContext);
var l = await biz.GetTranslationListAsync();
return Ok(ApiOkResponse.Response(l, true));
return Ok(ApiOkResponse.Response(l));
}
@@ -116,7 +116,7 @@ namespace AyaNova.Api.Controllers
TranslationBiz biz = TranslationBiz.GetBiz(ct, HttpContext);
var l = await biz.TranslationKeyCoverageAsync();
return Ok(ApiOkResponse.Response(l, true));
return Ok(ApiOkResponse.Response(l));
}
#endif
@@ -138,7 +138,7 @@ namespace AyaNova.Api.Controllers
TranslationBiz biz = TranslationBiz.GetBiz(ct, HttpContext);
var l = await biz.GetSubsetAsync(inObj);
return Ok(ApiOkResponse.Response(l, true));
return Ok(ApiOkResponse.Response(l));
}
@@ -234,7 +234,7 @@ namespace AyaNova.Api.Controllers
}
return Ok(ApiOkResponse.Response(new { Concurrency = oFromDb.Concurrency }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = oFromDb.Concurrency }));
}
@@ -354,7 +354,7 @@ namespace AyaNova.Api.Controllers
}
}
return Ok(ApiOkResponse.Response(new { Concurrency = oFromDb.Concurrency }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = oFromDb.Concurrency }));
}

View File

@@ -99,7 +99,7 @@ namespace AyaNova.Api.Controllers
return BadRequest(new ApiErrorResponse(ModelState));
var o = await biz.GetAsync(id);
if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType)));
return Ok(ApiOkResponse.Response(o));
}
/// <summary>
@@ -125,7 +125,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));;
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));;
}
/// <summary>

View File

@@ -99,7 +99,7 @@ namespace AyaNova.Api.Controllers
return BadRequest(new ApiErrorResponse(ModelState));
var o = await biz.GetAsync(id);
if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType)));
return Ok(ApiOkResponse.Response(o));
}
/// <summary>
@@ -125,7 +125,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));;
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));;
}
/// <summary>

View File

@@ -79,7 +79,7 @@ namespace AyaNova.Api.Controllers
return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
}
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType)));
return Ok(ApiOkResponse.Response(o));
}
@@ -107,7 +107,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true)); ;
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency })); ;
}
@@ -165,7 +165,7 @@ namespace AyaNova.Api.Controllers
// return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
// }
// }
// return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
// return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));
// }

View File

@@ -79,7 +79,7 @@ namespace AyaNova.Api.Controllers
return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
}
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType)));
return Ok(ApiOkResponse.Response(o));
}
@@ -138,7 +138,7 @@ namespace AyaNova.Api.Controllers
}
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));
}

View File

@@ -99,7 +99,7 @@ namespace AyaNova.Api.Controllers
return BadRequest(new ApiErrorResponse(ModelState));
var o = await biz.GetAsync(id);
if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType)));
return Ok(ApiOkResponse.Response(o));
}
/// <summary>
@@ -125,7 +125,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));;
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));;
}
/// <summary>

View File

@@ -107,7 +107,7 @@ namespace AyaNova.Api.Controllers
return BadRequest(new ApiErrorResponse(ModelState));
var o = await biz.GetAsync(id);
if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType)));
return Ok(ApiOkResponse.Response(o));
}
/// <summary>
@@ -133,7 +133,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true)); ;
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency })); ;
}
/// <summary>

View File

@@ -115,7 +115,7 @@ namespace AyaNova.Api.Controllers
return BadRequest(new ApiErrorResponse(ModelState));
var o = await biz.WorkOrderGetAsync(id);
if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType)));
return Ok(ApiOkResponse.Response(o));
}
@@ -143,7 +143,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));
}
/// <summary>
@@ -245,7 +245,7 @@ namespace AyaNova.Api.Controllers
var o = await biz.ItemGetAsync(WorkOrderItemId);
if (o == null)
return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, AyaType.WorkOrderItem)));
return Ok(ApiOkResponse.Response(o));
}
@@ -274,7 +274,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));
}
@@ -354,7 +354,7 @@ namespace AyaNova.Api.Controllers
var o = await biz.ExpenseGetAsync(WorkOrderItemExpenseId);
if (o == null)
return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, AyaType.WorkOrderItemExpense)));
return Ok(ApiOkResponse.Response(o));
}
/// <summary>
@@ -381,7 +381,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));
}
/// <summary>
@@ -461,7 +461,7 @@ namespace AyaNova.Api.Controllers
var o = await biz.LaborGetAsync(workOrderItemLaborId);
if (o == null)
return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, AyaType.WorkOrderItemLabor)));
return Ok(ApiOkResponse.Response(o));
}
@@ -489,7 +489,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));
}
@@ -570,7 +570,7 @@ namespace AyaNova.Api.Controllers
var o = await biz.LoanGetAsync(WorkOrderItemLoanId);
if (o == null)
return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, AyaType.WorkOrderItemLoan)));
return Ok(ApiOkResponse.Response(o));
}
/// <summary>
@@ -597,7 +597,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));
}
/// <summary>
@@ -676,7 +676,7 @@ namespace AyaNova.Api.Controllers
var o = await biz.PartGetAsync(WorkOrderItemPartId);
if (o == null)
return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, AyaType.WorkOrderItemPart)));
return Ok(ApiOkResponse.Response(o));
}
/// <summary>
@@ -703,7 +703,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));
}
/// <summary>
@@ -782,7 +782,7 @@ namespace AyaNova.Api.Controllers
var o = await biz.PartRequestGetAsync(WorkOrderItemPartRequestId);
if (o == null)
return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, AyaType.WorkOrderItemPartRequest)));
return Ok(ApiOkResponse.Response(o));
}
/// <summary>
@@ -809,7 +809,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));
}
/// <summary>
@@ -888,7 +888,7 @@ namespace AyaNova.Api.Controllers
var o = await biz.ScheduledUserGetAsync(WorkOrderItemScheduledUserId);
if (o == null)
return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, AyaType.WorkOrderItemScheduledUser)));
return Ok(ApiOkResponse.Response(o));
}
/// <summary>
@@ -915,7 +915,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));
}
/// <summary>
@@ -994,7 +994,7 @@ namespace AyaNova.Api.Controllers
var o = await biz.TaskGetAsync(WorkOrderItemTaskId);
if (o == null)
return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, AyaType.WorkOrderItemTask)));
return Ok(ApiOkResponse.Response(o));
}
/// <summary>
@@ -1021,7 +1021,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));
}
/// <summary>
@@ -1100,7 +1100,7 @@ namespace AyaNova.Api.Controllers
var o = await biz.TravelGetAsync(WorkOrderItemTravelId);
if (o == null)
return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, AyaType.WorkOrderItemTravel)));
return Ok(ApiOkResponse.Response(o));
}
/// <summary>
@@ -1127,7 +1127,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));
}
/// <summary>
@@ -1206,7 +1206,7 @@ namespace AyaNova.Api.Controllers
var o = await biz.UnitGetAsync(WorkOrderItemUnitId);
if (o == null)
return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, AyaType.WorkOrderItemUnit)));
return Ok(ApiOkResponse.Response(o));
}
/// <summary>
@@ -1233,7 +1233,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));
}
/// <summary>

View File

@@ -68,7 +68,7 @@ namespace AyaNova.Api.Controllers
// NOTE: HERE would be the second check of biz rules before returning the object
// in cases where there is also a business rule to affect retrieval on top of basic rights
return Ok(ApiOkResponse.Response(o, !Authorized.HasModifyRole(HttpContext.Items, biz.BizType)));
return Ok(ApiOkResponse.Response(o));
}
@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }));
}

View File

@@ -198,7 +198,7 @@
// //dump file name example: ayanova.data.dump.XXX.zip
// List<string> l = FileUtil.UtilityFileList("ayanova.data.dump.*.zip");
// return Ok(ApiOkResponse.Response(l, true));
// return Ok(ApiOkResponse.Response(l));
// }