paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[reorg]

Browse Source
This commit is contained in:
Paul Schneider
2019-05-07 14:01:23 +01:00
parent 042c3c873a
commit d3e57ba2d1
26 changed files with 128 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Yavsc/ApiControllers/HyperLinkApiController.cs
View File

@ -24,7 +24,7 @@ namespace Yavsc.Controllers
[HttpGet]
public IEnumerable<HyperLink> GetLinks()
{
return _context.Links;
return _context.HyperLink;
}
// GET: api/HyperLinkApi/5
@ -36,7 +36,7 @@ namespace Yavsc.Controllers
return HttpBadRequest(ModelState);
}
HyperLink hyperLink = await _context.Links.SingleAsync(m => m.HRef == id);
HyperLink hyperLink = await _context.HyperLink.SingleAsync(m => m.HRef == id);
if (hyperLink == null)
{
@ -90,7 +90,7 @@ namespace Yavsc.Controllers
return HttpBadRequest(ModelState);
}
_context.Links.Add(hyperLink);
_context.HyperLink.Add(hyperLink);
try
{
await _context.SaveChangesAsync();
@ -119,13 +119,13 @@ namespace Yavsc.Controllers
return HttpBadRequest(ModelState);
}
HyperLink hyperLink = await _context.Links.SingleAsync(m => m.HRef == id);
HyperLink hyperLink = await _context.HyperLink.SingleAsync(m => m.HRef == id);
if (hyperLink == null)
{
return HttpNotFound();
}
_context.Links.Remove(hyperLink);
_context.HyperLink.Remove(hyperLink);
await _context.SaveChangesAsync();
return Ok(hyperLink);
@ -142,7 +142,7 @@ namespace Yavsc.Controllers
private bool HyperLinkExists(string id)
{
return _context.Links.Count(e => e.HRef == id) > 0;
return _context.HyperLink.Count(e => e.HRef == id) > 0;
}
}
}

12
src/Yavsc/ApiControllers/Musical/MusicalPreferencesApiController.cs
View File

@ -24,7 +24,7 @@ namespace Yavsc.Controllers
[HttpGet]
public IEnumerable<MusicalPreference> GetMusicalPreferences()
{
return _context.MusicalPreferences;
return _context.MusicalPreference;
}
// GET: api/MusicalPreferencesApi/5
@ -36,7 +36,7 @@ namespace Yavsc.Controllers
return HttpBadRequest(ModelState);
}
MusicalPreference musicalPreference = _context.MusicalPreferences.Single(m => m.OwnerProfileId == id);
MusicalPreference musicalPreference = _context.MusicalPreference.Single(m => m.OwnerProfileId == id);
if (musicalPreference == null)
{
@ -89,7 +89,7 @@ namespace Yavsc.Controllers
return HttpBadRequest(ModelState);
}
_context.MusicalPreferences.Add(musicalPreference);
_context.MusicalPreference.Add(musicalPreference);
try
{
_context.SaveChanges(User.GetUserId());
@ -118,13 +118,13 @@ namespace Yavsc.Controllers
return HttpBadRequest(ModelState);
}
MusicalPreference musicalPreference = _context.MusicalPreferences.Single(m => m.OwnerProfileId == id);
MusicalPreference musicalPreference = _context.MusicalPreference.Single(m => m.OwnerProfileId == id);
if (musicalPreference == null)
{
return HttpNotFound();
}
_context.MusicalPreferences.Remove(musicalPreference);
_context.MusicalPreference.Remove(musicalPreference);
_context.SaveChanges(User.GetUserId());
return Ok(musicalPreference);
@ -141,7 +141,7 @@ namespace Yavsc.Controllers
private bool MusicalPreferenceExists(string id)
{
return _context.MusicalPreferences.Count(e => e.OwnerProfileId == id) > 0;
return _context.MusicalPreference.Count(e => e.OwnerProfileId == id) > 0;
}
}
}

12
src/Yavsc/ApiControllers/Relationship/BlogAclApiController.cs
View File

@ -25,7 +25,7 @@ namespace Yavsc.Controllers
[HttpGet]
public IEnumerable<CircleAuthorizationToBlogPost> GetBlogACL()
{
return _context.BlogACL;
return _context.CircleAuthorizationToBlogPost;
}
// GET: api/BlogAclApi/5
@ -37,7 +37,7 @@ namespace Yavsc.Controllers
return HttpBadRequest(ModelState);
}
var uid = User.GetUserId();
CircleAuthorizationToBlogPost circleAuthorizationToBlogPost = await _context.BlogACL.SingleAsync(
CircleAuthorizationToBlogPost circleAuthorizationToBlogPost = await _context.CircleAuthorizationToBlogPost.SingleAsync(
m => m.CircleId == id && m.Allowed.OwnerId == uid );
if (circleAuthorizationToBlogPost == null)
@ -106,7 +106,7 @@ namespace Yavsc.Controllers
{
return new ChallengeResult();
}
_context.BlogACL.Add(circleAuthorizationToBlogPost);
_context.CircleAuthorizationToBlogPost.Add(circleAuthorizationToBlogPost);
try
{
await _context.SaveChangesAsync(User.GetUserId());
@ -136,7 +136,7 @@ namespace Yavsc.Controllers
}
var uid = User.GetUserId();
CircleAuthorizationToBlogPost circleAuthorizationToBlogPost = await _context.BlogACL.Include(
CircleAuthorizationToBlogPost circleAuthorizationToBlogPost = await _context.CircleAuthorizationToBlogPost.Include(
a=>a.Allowed
).SingleAsync(m => m.CircleId == id
&& m.Allowed.OwnerId == uid);
@ -144,7 +144,7 @@ namespace Yavsc.Controllers
{
return HttpNotFound();
}
_context.BlogACL.Remove(circleAuthorizationToBlogPost);
_context.CircleAuthorizationToBlogPost.Remove(circleAuthorizationToBlogPost);
await _context.SaveChangesAsync(User.GetUserId());
return Ok(circleAuthorizationToBlogPost);
@ -161,7 +161,7 @@ namespace Yavsc.Controllers
private bool CircleAuthorizationToBlogPostExists(long id)
{
return _context.BlogACL.Count(e => e.CircleId == id) > 0;
return _context.CircleAuthorizationToBlogPost.Count(e => e.CircleId == id) > 0;
}
}
}

2
src/Yavsc/ApiControllers/Relationship/ChatApiController.cs
View File

@ -25,7 +25,7 @@ namespace Yavsc.Controllers
public IEnumerable<ChatUserInfo> GetUserList()
{
List<ChatUserInfo> result = new List<ChatUserInfo>();
var cxsQuery = dbContext.Connections?.Include(c=>c.Owner).GroupBy( c => c.ApplicationUserId );
var cxsQuery = dbContext.ChatConnection?.Include(c=>c.Owner).GroupBy( c => c.ApplicationUserId );
// List<ChatUserInfo> result = new List<ChatUserInfo>();
if (cxsQuery!=null)