Add fields to activity call (#16)

ubisoft · Jun 2, 2021 · 4e71956 · 4e71956
1 parent 1c407d9
commit 4e71956
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 5 deletions.
diff --git a/NGitLab/Models/Event.cs b/NGitLab/Models/Event.cs
@@ -45,26 +45,53 @@ public class Event
         [DataMember(Name = "push_data")]
         public PushData PushData { get; set; }
 
+        /// <summary>
+        /// The target is either a gitlab object (like a merge request)
+        /// or a commit object
+        /// </summary>
+        public string ResolvedTargetTitle
+        {
+            get
+            {
+                if (TargetTitle != null)
+                {
+                    return $"{TargetType} '{TargetTitle}'";
+                }
+
+                if (PushData != null)
+                {
+                    return $"{PushData.RefType} '{PushData.Ref}'";
+                }
+
+                return string.Empty;
+            }
+        }
+
         /// <summary>
         /// Debug display
         /// </summary>
         /// <returns></returns>
         public override string ToString()
         {
-            return $"{AuthorUserName} {Action} {TargetType} {GetAge(CreatedAt)}";
+            return ToString(ProjectId.ToString());
+        }
+
+        public string ToString(string projectName)
+        {
+            return $"{AuthorUserName} {Action} {ResolvedTargetTitle} at {projectName} ({GetAge(CreatedAt)})";
         }
 
         private static string GetAge(DateTime date)
         {
-            var age = DateTime.Now.Subtract(date);
+            var age = DateTime.UtcNow.Subtract(date);
 
             if (age.TotalDays > 1)
-                return $"{age.TotalDays:0.0} days ago";
+                return $"{age.TotalDays:0} days ago";
 
             if (age.TotalHours > 1)
-                return $"{age.Hours:0.0} hours ago";
+                return $"{age.Hours:0} hours ago";
 
-            return $"{age.Minutes:0.0} minutes ago";
+            return $"{age.Minutes:0} minutes ago";
         }
     }
 }
diff --git a/NGitLab/Models/PushData.cs b/NGitLab/Models/PushData.cs
@@ -10,5 +10,14 @@ public class PushData
 
         [DataMember(Name = "action")]
         public PushDataAction Action { get; set; }
+
+        [DataMember(Name = "ref")]
+        public string Ref { get; set; }
+
+        [DataMember(Name = "ref_type")]
+        public CommitRefType RefType { get; set; }
+
+        [DataMember(Name = "commit_title")]
+        public string CommitTitle { get; set; }
     }
 }