From 3717afa934930a7e82ec310e8d288be03e643dd6 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 7 Dec 2018 18:53:59 +0000 Subject: [PATCH] --- devdocs/todo.txt | 11 ----------- server/AyaNova/biz/DataFilterBiz.cs | 1 + server/AyaNova/biz/LocaleBiz.cs | 1 + server/AyaNova/biz/UserBiz.cs | 9 ++++++--- server/AyaNova/biz/WidgetBiz.cs | 2 ++ 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/devdocs/todo.txt b/devdocs/todo.txt index b5c595f0..a7c470d4 100644 --- a/devdocs/todo.txt +++ b/devdocs/todo.txt @@ -5,17 +5,6 @@ Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpYXQiOiIxNTQyNjY5Njc3IiwiZXhwIjoi ## IMMEDIATE ITEMS -Remove old tag code, models, schema tables, cleanup and db erase code that refers to them - -SON OF TAGS - - - - Test v7 import tags users with correct tags for region, sched group and dispatch zone - -SERVER SCHEMA - - Add unique constraint to all name columns in all tables in ayschema and run tests (how did I miss that before??) - - See datafilter schema code (note that it will increase the index count by one) - - http://www.postgresqltutorial.com/postgresql-unique-constraint/ SERVER ALL LIST ROUTES - Forgot to put AsNoTracking in the list routes, no need to track them as they are only returning info, not being modified diff --git a/server/AyaNova/biz/DataFilterBiz.cs b/server/AyaNova/biz/DataFilterBiz.cs index d107ac72..ea2c07bf 100644 --- a/server/AyaNova/biz/DataFilterBiz.cs +++ b/server/AyaNova/biz/DataFilterBiz.cs @@ -134,6 +134,7 @@ namespace AyaNova.Biz if (!string.IsNullOrWhiteSpace(listKey)) { items = await ct.DataFilter + .AsNoTracking() .Where(m => m.ListKey == listKey && (m.Public == true || m.OwnerId == UserId)) .OrderBy(m => m.Name) .Select(m => new NameIdItem() diff --git a/server/AyaNova/biz/LocaleBiz.cs b/server/AyaNova/biz/LocaleBiz.cs index 4348abfd..4aca5b09 100644 --- a/server/AyaNova/biz/LocaleBiz.cs +++ b/server/AyaNova/biz/LocaleBiz.cs @@ -99,6 +99,7 @@ namespace AyaNova.Biz { List l = new List(); l = await ct.Locale + .AsNoTracking() .OrderBy(m => m.Name) .Select(m => new NameIdItem() { diff --git a/server/AyaNova/biz/UserBiz.cs b/server/AyaNova/biz/UserBiz.cs index 4ec894b7..1364aaf4 100644 --- a/server/AyaNova/biz/UserBiz.cs +++ b/server/AyaNova/biz/UserBiz.cs @@ -151,6 +151,7 @@ namespace AyaNova.Biz pagingOptions.Limit = pagingOptions.Limit ?? PagingOptions.DefaultLimit; var items = await ct.User + .AsNoTracking() .OrderBy(m => m.Id) .Skip(pagingOptions.Offset.Value) .Take(pagingOptions.Limit.Value) @@ -183,6 +184,7 @@ namespace AyaNova.Biz if (!string.IsNullOrWhiteSpace(q)) { items = await ct.User + .AsNoTracking() .Where(m => EF.Functions.ILike(m.Name, q)) .OrderBy(m => m.Name) .Skip(pagingOptions.Offset.Value) @@ -198,9 +200,10 @@ namespace AyaNova.Biz else { items = await ct.User - .OrderBy(m => m.Name) - .Skip(pagingOptions.Offset.Value) - .Take(pagingOptions.Limit.Value) + .AsNoTracking() + .OrderBy(m => m.Name) + .Skip(pagingOptions.Offset.Value) + .Take(pagingOptions.Limit.Value) .Select(m => new NameIdItem() { Id = m.Id, diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs index f36ca402..846a2633 100644 --- a/server/AyaNova/biz/WidgetBiz.cs +++ b/server/AyaNova/biz/WidgetBiz.cs @@ -228,6 +228,7 @@ namespace AyaNova.Biz if (!string.IsNullOrWhiteSpace(q)) { items = await ct.Widget + .AsNoTracking() .Where(m => EF.Functions.ILike(m.Name, q)) .OrderBy(m => m.Name) .Skip(pagingOptions.Offset.Value) @@ -243,6 +244,7 @@ namespace AyaNova.Biz else { items = await ct.Widget + .AsNoTracking() .OrderBy(m => m.Name) .Skip(pagingOptions.Offset.Value) .Take(pagingOptions.Limit.Value)