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

Rename ConcurrencyToken to Concurrency

Browse Source
This commit is contained in:
John Cardinal
2020-05-13 19:54:41 +00:00
parent 6a9984720d
commit 539d590ce8
96 changed files with 144 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/AyaNova/Controllers/AttachmentController.cs
View File

@@ -56,7 +56,7 @@ namespace AyaNova.Api.Controllers
public class UpdateAttachmentInfo
{
[Required]
public uint ConcurrencyToken { get; set; }
public uint Concurrency { get; set; }
[Required]
public string DisplayFileName { get; set; }
public string Notes { get; set; }
@@ -114,7 +114,7 @@ namespace AyaNova.Api.Controllers
//Set "original" value of concurrency token to input token
//this will allow EF to check it out
ct.Entry(dbObj).OriginalValues["ConcurrencyToken"] = inObj.ConcurrencyToken;
ct.Entry(dbObj).OriginalValues["Concurrency"] = inObj.Concurrency;
//Log event and save context
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, dbObj.AttachToObjectId, dbObj.AttachToObjectType, AyaEvent.AttachmentModified, ChangeTextra), ct);
@@ -492,7 +492,7 @@ namespace AyaNova.Api.Controllers
async private Task<object> GetFileListForObjectAsync(AyaType ayaType, long ayaId)
{
var l = await ct.FileAttachment.AsNoTracking().Where(m => m.AttachToObjectId == ayaId && m.AttachToObjectType == ayaType)
.Select(m => new { m.Id, m.ConcurrencyToken, m.ContentType, m.DisplayFileName, m.LastModified, m.Notes })
.Select(m => new { m.Id, m.Concurrency, m.ContentType, m.DisplayFileName, m.LastModified, m.Notes })
.ToArrayAsync();
var v = l.OrderBy(m => m.DisplayFileName);
return v;

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

@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}

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

@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}

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

@@ -133,7 +133,7 @@ namespace AyaNova.Api.Controllers
else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}

4
server/AyaNova/Controllers/FormCustomController.cs
View File

@@ -77,7 +77,7 @@ namespace AyaNova.Api.Controllers
//If concurrency token specified then check if ours is newer
if (concurrencyToken != null)
{
if (o.ConcurrencyToken == concurrencyToken)
if (o.Concurrency == concurrencyToken)
{
//returns a code 304 (NOT MODIFIED)
return StatusCode(304);
@@ -175,7 +175,7 @@ namespace AyaNova.Api.Controllers
else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}

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

@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}
/// <summary>

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

@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}

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

@@ -109,7 +109,7 @@ namespace AyaNova.Api.Controllers
else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}

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

@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}

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

@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}

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

@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}

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

@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}

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

@@ -109,7 +109,7 @@ namespace AyaNova.Api.Controllers
else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}

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

@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}

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

@@ -234,7 +234,7 @@ namespace AyaNova.Api.Controllers
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = oFromDb.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = oFromDb.Concurrency }, true));
}
@@ -354,7 +354,7 @@ namespace AyaNova.Api.Controllers
}
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = oFromDb.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = oFromDb.Concurrency }, true));
}

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

@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}

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

@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}

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

@@ -138,7 +138,7 @@ namespace AyaNova.Api.Controllers
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}

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

@@ -138,7 +138,7 @@ namespace AyaNova.Api.Controllers
}
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}

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

@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}

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

@@ -117,7 +117,7 @@ namespace AyaNova.Api.Controllers
else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}

22
server/AyaNova/Controllers/WorkOrderController.cs
View File

@@ -145,7 +145,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}
/// <summary>
@@ -252,7 +252,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}
@@ -359,7 +359,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}
/// <summary>
@@ -467,7 +467,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}
@@ -575,7 +575,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}
/// <summary>
@@ -681,7 +681,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}
/// <summary>
@@ -787,7 +787,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}
/// <summary>
@@ -893,7 +893,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}
/// <summary>
@@ -999,7 +999,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}
/// <summary>
@@ -1105,7 +1105,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}
/// <summary>
@@ -1211,7 +1211,7 @@ namespace AyaNova.Api.Controllers
else
return BadRequest(new ApiErrorResponse(biz.Errors));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}
/// <summary>

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

@@ -110,7 +110,7 @@ namespace AyaNova.Api.Controllers
else
return StatusCode(409, new ApiErrorResponse(ApiErrorCode.CONCURRENCY_CONFLICT));
}
return Ok(ApiOkResponse.Response(new { ConcurrencyToken = o.ConcurrencyToken }, true));
return Ok(ApiOkResponse.Response(new { Concurrency = o.Concurrency }, true));
}