diff --git a/server/AyaNova/Controllers/DataListFilterController.cs b/server/AyaNova/Controllers/DataListFilterController.cs
index ad677a3a..f2d49e4b 100644
--- a/server/AyaNova/Controllers/DataListFilterController.cs
+++ b/server/AyaNova/Controllers/DataListFilterController.cs
@@ -103,7 +103,7 @@ namespace AyaNova.Api.Controllers
///
///
[HttpPut("{id}")]
- public async Task PutDataFilter([FromRoute] long id, [FromBody] DataListFilter inObj)
+ public async Task PutDataFilter([FromRoute] long id, [FromBody] DataListSortFilter inObj)
{
if (!serverState.IsOpen)
return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason));
@@ -144,7 +144,7 @@ namespace AyaNova.Api.Controllers
/// Automatically filled from route path, no need to specify in body
///
[HttpPost]
- public async Task PostDataFilter([FromBody] DataListFilter inObj, ApiVersion apiVersion)
+ public async Task PostDataFilter([FromBody] DataListSortFilter inObj, ApiVersion apiVersion)
{
if (!serverState.IsOpen)
return StatusCode(503, new ApiErrorResponse(ApiErrorCode.API_CLOSED, null, serverState.Reason));
@@ -160,7 +160,7 @@ namespace AyaNova.Api.Controllers
return BadRequest(new ApiErrorResponse(ModelState));
//Create and validate
- DataListFilter o = await biz.CreateAsync(inObj);
+ DataListSortFilter o = await biz.CreateAsync(inObj);
if (o == null)
return BadRequest(new ApiErrorResponse(biz.Errors));
else
diff --git a/server/AyaNova/biz/BizObjectExistsInDatabase.cs b/server/AyaNova/biz/BizObjectExistsInDatabase.cs
index ae6ecbc5..d7dc6c08 100644
--- a/server/AyaNova/biz/BizObjectExistsInDatabase.cs
+++ b/server/AyaNova/biz/BizObjectExistsInDatabase.cs
@@ -37,7 +37,7 @@ namespace AyaNova.Biz
case AyaType.FileAttachment:
return await ct.FileAttachment.AnyAsync(m => m.Id == id);
case AyaType.DataListFilter:
- return await ct.DataListFilter.AnyAsync(m => m.Id == id);
+ return await ct.DataListSortFilter.AnyAsync(m => m.Id == id);
case AyaType.DataListTemplate:
return await ct.DataListTemplate.AnyAsync(m => m.Id == id);
case AyaType.FormCustom:
diff --git a/server/AyaNova/biz/DataListFilterBiz.cs b/server/AyaNova/biz/DataListSortFilterBiz.cs
similarity index 91%
rename from server/AyaNova/biz/DataListFilterBiz.cs
rename to server/AyaNova/biz/DataListSortFilterBiz.cs
index fc62f735..c269e783 100644
--- a/server/AyaNova/biz/DataListFilterBiz.cs
+++ b/server/AyaNova/biz/DataListSortFilterBiz.cs
@@ -40,14 +40,14 @@ namespace AyaNova.Biz
//EXISTS
internal async Task ExistsAsync(long id)
{
- return await ct.DataListFilter.AnyAsync(e => e.Id == id);
+ return await ct.DataListSortFilter.AnyAsync(e => e.Id == id);
}
////////////////////////////////////////////////////////////////////////////////////////////////
//CREATE
- internal async Task CreateAsync(DataListFilter inObj)
+ internal async Task CreateAsync(DataListSortFilter inObj)
{
await ValidateAsync(inObj, true);
if (HasErrors)
@@ -55,11 +55,11 @@ namespace AyaNova.Biz
else
{
//do stuff with datafilter
- DataListFilter outObj = inObj;
+ DataListSortFilter outObj = inObj;
outObj.UserId = UserId;
- await ct.DataListFilter.AddAsync(outObj);
+ await ct.DataListSortFilter.AddAsync(outObj);
await ct.SaveChangesAsync();
//Handle child and associated items:
@@ -81,10 +81,10 @@ namespace AyaNova.Biz
/// GET
//Get one
- internal async Task GetAsync(long fetchId, bool logTheGetEvent = true)
+ internal async Task GetAsync(long fetchId, bool logTheGetEvent = true)
{
//This is simple so nothing more here, but often will be copying to a different output object or some other ops
- var ret = await ct.DataListFilter.SingleOrDefaultAsync(m => m.Id == fetchId && (m.Public == true || m.UserId == UserId));
+ var ret = await ct.DataListSortFilter.SingleOrDefaultAsync(m => m.Id == fetchId && (m.Public == true || m.UserId == UserId));
if (logTheGetEvent && ret != null)
{
//Log
@@ -102,7 +102,7 @@ namespace AyaNova.Biz
List items = new List();
if (!string.IsNullOrWhiteSpace(listKey))
{
- items = await ct.DataListFilter
+ items = await ct.DataListSortFilter
.AsNoTracking()
.Where(m => m.ListKey == listKey && (m.Public == true || m.UserId == UserId))
.OrderBy(m => m.Name)
@@ -124,7 +124,7 @@ namespace AyaNova.Biz
//
//put
- internal async Task PutAsync(DataListFilter dbObj, DataListFilter inObj)
+ internal async Task PutAsync(DataListSortFilter dbObj, DataListSortFilter inObj)
{
//preserve the owner ID if none was specified
if (inObj.UserId == 0)
@@ -154,7 +154,7 @@ namespace AyaNova.Biz
////////////////////////////////////////////////////////////////////////////////////////////////
//DELETE
//
- internal async Task DeleteAsync(DataListFilter dbObj)
+ internal async Task DeleteAsync(DataListSortFilter dbObj)
{
//Determine if the object can be deleted, do the deletion tentatively
//Probably also in here deal with tags and associated search text etc
@@ -164,7 +164,7 @@ namespace AyaNova.Biz
if (HasErrors)
return false;
- ct.DataListFilter.Remove(dbObj);
+ ct.DataListSortFilter.Remove(dbObj);
await ct.SaveChangesAsync();
//Delete sibling objects
@@ -185,7 +185,7 @@ namespace AyaNova.Biz
//
//Can save or update?
- private async Task ValidateAsync(DataListFilter inObj, bool isNew)
+ private async Task ValidateAsync(DataListSortFilter inObj, bool isNew)
{
//UserId required
@@ -209,7 +209,7 @@ namespace AyaNova.Biz
if (!PropertyHasErrors("Name"))
{
//Use Any command is efficient way to check existance, it doesn't return the record, just a true or false
- if (await ct.DataListFilter.AnyAsync(m => m.Name == inObj.Name && m.Id != inObj.Id))
+ if (await ct.DataListSortFilter.AnyAsync(m => m.Name == inObj.Name && m.Id != inObj.Id))
{
AddError(ApiErrorCode.VALIDATION_NOT_UNIQUE, "Name");
}
diff --git a/server/AyaNova/models/AyContext.cs b/server/AyaNova/models/AyContext.cs
index 49adbb5f..8abfd5ec 100644
--- a/server/AyaNova/models/AyContext.cs
+++ b/server/AyaNova/models/AyContext.cs
@@ -17,7 +17,7 @@ namespace AyaNova.Models
public virtual DbSet OpsJobLog { get; set; }
public virtual DbSet Locale { get; set; }
public virtual DbSet LocaleItem { get; set; }
- public virtual DbSet DataListFilter { get; set; }
+ public virtual DbSet DataListSortFilter { get; set; }
public virtual DbSet Tag { get; set; }
public virtual DbSet FormCustom { get; set; }
public virtual DbSet DataListTemplate { get; set; }
diff --git a/server/AyaNova/models/DataListFilter.cs b/server/AyaNova/models/DataListSortFilter.cs
similarity index 90%
rename from server/AyaNova/models/DataListFilter.cs
rename to server/AyaNova/models/DataListSortFilter.cs
index 9c4f035f..6bcf464b 100644
--- a/server/AyaNova/models/DataListFilter.cs
+++ b/server/AyaNova/models/DataListSortFilter.cs
@@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
namespace AyaNova.Models
{
- public partial class DataListFilter
+ public partial class DataListSortFilter
{
public long Id { get; set; }
public uint ConcurrencyToken { get; set; }
diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs
index 1cde02e7..001503c0 100644
--- a/server/AyaNova/util/AySchema.cs
+++ b/server/AyaNova/util/AySchema.cs
@@ -266,7 +266,7 @@ namespace AyaNova.Util
{
LogUpdateMessage(log);
- await ExecQueryAsync("CREATE TABLE adatalistfilter (id BIGSERIAL PRIMARY KEY, userId bigint not null, name varchar(255) not null, public bool not null," +
+ await ExecQueryAsync("CREATE TABLE adatalistsortfilter (id BIGSERIAL PRIMARY KEY, userId bigint not null, name varchar(255) not null, public bool not null," +
"listkey varchar(255) not null, filter text, sort text, UNIQUE(name))");
await ExecQueryAsync("CREATE TABLE adatalisttemplate (id BIGSERIAL PRIMARY KEY, datalistkey text not null, template text, UNIQUE(datalistkey))");