Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Server naming fixes and cleanup

Browse Source 
Server is now completely cleaned up and without warnings
This commit is contained in:
Pavel Vesely
2020-03-15 09:38:37 +01:00
parent ab3f0853a7
commit 5b3feaf26f
92 changed files with 1223 additions and 1273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Oqtane.Server/Repository/NotificationRepository.cs
View File

@ -1,6 +1,6 @@
using Microsoft.EntityFrameworkCore;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using Microsoft.EntityFrameworkCore;
using Oqtane.Models;
namespace Oqtane.Repository
@ -14,52 +14,50 @@ namespace Oqtane.Repository
_db = context;
}
public IEnumerable<Notification> GetNotifications(int SiteId, int FromUserId, int ToUserId)
public IEnumerable<Notification> GetNotifications(int siteId, int fromUserId, int toUserId)
{
if (ToUserId == -1 && FromUserId == -1)
if (toUserId == -1 && fromUserId == -1)
{
return _db.Notification
.Where(item => item.SiteId == SiteId)
.Where(item => item.SiteId == siteId)
.Where(item => item.IsDelivered == false)
.Include(item => item.FromUser)
.Include(item => item.ToUser)
.ToList();
}
else
{
return _db.Notification
.Where(item => item.SiteId == SiteId)
.Where(item => item.ToUserId == ToUserId || ToUserId == -1)
.Where(item => item.FromUserId == FromUserId || FromUserId == -1)
.Include(item => item.FromUser)
.Include(item => item.ToUser)
.ToList();
}
return _db.Notification
.Where(item => item.SiteId == siteId)
.Where(item => item.ToUserId == toUserId || toUserId == -1)
.Where(item => item.FromUserId == fromUserId || fromUserId == -1)
.Include(item => item.FromUser)
.Include(item => item.ToUser)
.ToList();
}
public Notification AddNotification(Notification Notification)
public Notification AddNotification(Notification notification)
{
_db.Notification.Add(Notification);
_db.Notification.Add(notification);
_db.SaveChanges();
return Notification;
return notification;
}
public Notification UpdateNotification(Notification Notification)
public Notification UpdateNotification(Notification notification)
{
_db.Entry(Notification).State = EntityState.Modified;
_db.Entry(notification).State = EntityState.Modified;
_db.SaveChanges();
return Notification;
return notification;
}
public Notification GetNotification(int NotificationId)
public Notification GetNotification(int notificationId)
{
return _db.Notification.Find(NotificationId);
return _db.Notification.Find(notificationId);
}
public void DeleteNotification(int NotificationId)
public void DeleteNotification(int notificationId)
{
Notification Notification = _db.Notification.Find(NotificationId);
_db.Notification.Remove(Notification);
Notification notification = _db.Notification.Find(notificationId);
_db.Notification.Remove(notification);
_db.SaveChanges();
}
}