Refactor Notifications Data Model

Author: thedillonb

CodeHub.Core/ViewModels/Notifications/NotificationsViewModel.cs

@@ -6,9 +6,7 @@
 using CodeHub.Core.Filters;
 using CodeHub.Core.ViewModels.Issues;
 using CodeHub.Core.ViewModels.PullRequests;
-using GitHubSharp.Models;
 using CodeHub.Core.Messages;
-using CodeHub.Core.ViewModels.Source;
 using CodeHub.Core.ViewModels.Changesets;
 using CodeHub.Core.Utils;
 using CodeHub.Core.Services;
@@ -18,15 +16,15 @@ namespace CodeHub.Core.ViewModels.Notifications
 {
     public class NotificationsViewModel : LoadableViewModel
     {
+        private readonly IApplicationService _applicationService;
         private readonly IMessageService _messageService;
-        private readonly FilterableCollectionViewModel<NotificationModel, NotificationsFilterModel> _notifications;
+        private readonly FilterableCollectionViewModel<Octokit.Notification, NotificationsFilterModel> _notifications;
         private ICommand _readAllCommand;
-        private ICommand _readCommand;
         private ICommand _readReposCommand;
         private int _shownIndex;
         private bool _isMarking;
 
-        public FilterableCollectionViewModel<NotificationModel, NotificationsFilterModel> Notifications
+        public FilterableCollectionViewModel<Octokit.Notification, NotificationsFilterModel> Notifications
         {
             get { return _notifications; }
         }
@@ -43,58 +41,56 @@ public bool IsMarking
             set { this.RaiseAndSetIfChanged(ref _isMarking, value); }
         }
 
-        public ICommand ReadCommand
-        {
-            get { return _readCommand ?? (_readCommand = new MvxCommand<NotificationModel>(x => Read(x)));}
-        }
-
         public ICommand ReadRepositoriesCommand
         {
-            get { return _readReposCommand ?? (_readReposCommand = new MvxCommand<string>(x => MarkRepoAsRead(x))); }
+            get { return _readReposCommand ?? (_readReposCommand = new MvxAsyncCommand<string>(x => MarkRepoAsRead(x))); }
         }
 
         public ICommand ReadAllCommand
         {
-            get { return _readAllCommand ?? (_readAllCommand = new MvxCommand(() => MarkAllAsRead(), () => ShownIndex != 2 && !IsLoading && !IsMarking && Notifications.Any())); }
+            get { return _readAllCommand ?? (_readAllCommand = new MvxAsyncCommand(() => MarkAllAsRead(), () => ShownIndex != 2 && !IsLoading && !IsMarking && Notifications.Any())); }
         }
 
         public ICommand GoToNotificationCommand
         {
-            get { return new MvxCommand<NotificationModel>(GoToNotification); }
+            get { return new MvxCommand<Octokit.Notification>(GoToNotification); }
         }
 
-        private void GoToNotification(NotificationModel x)
+        private void GoToNotification(Octokit.Notification x)
         {
             var subject = x.Subject.Type.ToLower();
             if (subject.Equals("issue"))
             {
-                ReadCommand.Execute(x);
+                Read(x).ToBackground();
                 var node = x.Subject.Url.Substring(x.Subject.Url.LastIndexOf('/') + 1);
                 ShowViewModel<IssueViewModel>(new IssueViewModel.NavObject { Username = x.Repository.Owner.Login,Repository = x.Repository.Name, Id = long.Parse(node) });
             }
             else if (subject.Equals("pullrequest"))
             {
-                ReadCommand.Execute(x);
+                Read(x).ToBackground();
                 var node = x.Subject.Url.Substring(x.Subject.Url.LastIndexOf('/') + 1);
                 ShowViewModel<PullRequestViewModel>(new PullRequestViewModel.NavObject { Username = x.Repository.Owner.Login, Repository = x.Repository.Name, Id = long.Parse(node) });
             }
             else if (subject.Equals("commit"))
             {
-                ReadCommand.Execute(x);
+                Read(x).ToBackground();
                 var node = x.Subject.Url.Substring(x.Subject.Url.LastIndexOf('/') + 1);
                 ShowViewModel<ChangesetViewModel>(new ChangesetViewModel.NavObject { Username = x.Repository.Owner.Login, Repository = x.Repository.Name, Node = node });
             }
             else if (subject.Equals("release"))
             {
-                ReadCommand.Execute(x);
+                Read(x).ToBackground();
                 ShowViewModel<RepositoryViewModel>(new RepositoryViewModel.NavObject { Username = x.Repository.Owner.Login, Repository = x.Repository.Name });
             }
         }
 
-        public NotificationsViewModel(IMessageService messageService = null)
+        public NotificationsViewModel(
+            IMessageService messageService = null,
+            IApplicationService applicationService = null)
         {
             _messageService = messageService ?? GetService<IMessageService>();
-            _notifications = new FilterableCollectionViewModel<NotificationModel, NotificationsFilterModel>("Notifications");
+            _applicationService = applicationService ?? GetService<IApplicationService>();
+            _notifications = new FilterableCollectionViewModel<Octokit.Notification, NotificationsFilterModel>("Notifications");
             _notifications.GroupingFunction = (n) => n.GroupBy(x => x.Repository.FullName);
             _notifications.Bind(x => x.Filter).Subscribe(_ => LoadCommand.Execute(false));
 
@@ -115,32 +111,36 @@ public NotificationsViewModel(IMessageService messageService = null)
 
         }
 
-        protected override Task Load()
+        protected override async Task Load()
         {
-            return this.RequestModel(this.GetApplication().Client.Notifications.GetAll(all: Notifications.Filter.All, participating: Notifications.Filter.Participating), response => {
-                Notifications.Items.Reset(response.Data);
-                UpdateAccountNotificationsCount();
-            });
+            var req = new Octokit.NotificationsRequest
+            {
+                All = Notifications.Filter.All,
+                Participating = Notifications.Filter.Participating
+            };
+
+            var notifications = await _applicationService.GitHubClient.Activity.Notifications.GetAllForCurrent(req);
+            Notifications.Items.Reset(notifications);
+            UpdateAccountNotificationsCount();
         }
 
-        private async Task Read(NotificationModel model)
+        private async Task Read(Octokit.Notification model)
         {
             // If its already read, ignore it
             if (!model.Unread)
                 return;
 
             try
             {
-                var response = await this.GetApplication().Client.ExecuteAsync(this.GetApplication().Client.Notifications[model.Id].MarkAsRead());
-                if (response.Data) 
-                {
-                    //We just read it
-                    model.Unread = false;
-     
-                    //Update the notifications count on the account
+                if (!int.TryParse(model.Id, out int id))
+                    return;
+
+                await _applicationService.GitHubClient.Activity.Notifications.MarkAsRead(id);
+
+                if (_shownIndex != 2)
                     Notifications.Items.Remove(model);
-                    UpdateAccountNotificationsCount();
-                }
+
+                UpdateAccountNotificationsCount();
             }
             catch
             {
@@ -198,7 +198,7 @@ private void UpdateAccountNotificationsCount()
             if (!Notifications.Filter.All && !Notifications.Filter.Participating)
             {
                 var count = Notifications.Items.Sum(x => x.Unread ? 1 : 0);
-                _messageService.Send<NotificationCountMessage>(new NotificationCountMessage(count));
+                _messageService.Send(new NotificationCountMessage(count));
             }
         }
     }

CodeHub.iOS/Views/NotificationsView.cs

@@ -5,7 +5,6 @@
 using CodeHub.Core.ViewModels.Notifications;
 using Humanizer;
 using CodeHub.iOS.DialogElements;
-using GitHubSharp.Models;
 using System.Reactive.Linq;
 
 namespace CodeHub.iOS.Views
@@ -44,7 +43,10 @@ public override void ViewDidLoad()
 
             BindCollection(vm.Notifications, x =>
             {
-                var el = new StringElement(x.Subject.Title, x.UpdatedAt.Humanize(), UITableViewCellStyle.Subtitle) { Accessory = UITableViewCellAccessory.DisclosureIndicator };
+                if (!DateTimeOffset.TryParse(x.UpdatedAt, out DateTimeOffset dt))
+                    dt = DateTimeOffset.Now;
+
+                var el = new StringElement(x.Subject.Title, dt.Humanize(), UITableViewCellStyle.Subtitle) { Accessory = UITableViewCellAccessory.DisclosureIndicator };
 
                 var subject = x.Subject.Type.ToLower();
                 if (subject.Equals("issue"))
@@ -74,7 +76,7 @@ public override void ViewDidLoad()
             });
         }
 
-        private static Action<object> MakeCallback(WeakReference<NotificationsViewModel> weakVm, NotificationModel model)
+        private static Action<object> MakeCallback(WeakReference<NotificationsViewModel> weakVm, Octokit.Notification model)
         {
             return new Action<object>(_ => weakVm.Get()?.GoToNotificationCommand.Execute(model));
         }