Added comment text in activity log

canopas · Jan 9, 2025 · 776557d · 776557d
1 parent 0059f08
commit 776557d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/Data/Data/Model/ActivityLog.swift b/Data/Data/Model/ActivityLog.swift
@@ -25,15 +25,17 @@ public struct ActivityLog: Codable, Identifiable, Hashable {
     public let previousGroupName: String?
     public let removedMemberName: String?
     public let expenseName: String?
+    public let comment: String?
     public let payerName: String?
     public let receiverName: String?
     public let paymentReason: String?
     public let amount: Double?
 
     public init(type: ActivityType, groupId: String, activityId: String, groupName: String,
                 actionUserName: String, recordedOn: Timestamp, previousGroupName: String? = nil,
-                removedMemberName: String? = nil, expenseName: String? = nil, payerName: String? = nil,
-                receiverName: String? = nil, paymentReason: String? = nil, amount: Double? = nil) {
+                removedMemberName: String? = nil, expenseName: String? = nil, comment: String? = nil,
+                payerName: String? = nil, receiverName: String? = nil, paymentReason: String? = nil,
+                amount: Double? = nil) {
         self.type = type
         self.groupId = groupId
         self.activityId = activityId
@@ -43,6 +45,7 @@ public struct ActivityLog: Codable, Identifiable, Hashable {
         self.previousGroupName = previousGroupName
         self.removedMemberName = removedMemberName
         self.expenseName = expenseName
+        self.comment = comment
         self.payerName = payerName
         self.receiverName = receiverName
         self.paymentReason = paymentReason
@@ -60,6 +63,7 @@ public struct ActivityLog: Codable, Identifiable, Hashable {
         case previousGroupName = "previous_group_name"
         case removedMemberName = "removed_member_name"
         case expenseName = "expense_name"
+        case comment
         case payerName = "payer_name"
         case receiverName = "receiver_name"
         case paymentReason = "payment_reason"

diff --git a/Data/Data/Repository/ExpenseRepository.swift b/Data/Data/Repository/ExpenseRepository.swift
@@ -142,7 +142,7 @@ public class ExpenseRepository: ObservableObject {
 
         return ActivityLog(type: context.type, groupId: groupId, activityId: expenseId, groupName: group.name,
                            actionUserName: actionUserName, recordedOn: Timestamp(date: Date()),
-                           expenseName: expense.name, amount: amount)
+                           expenseName: expense.name, comment: expense.comments?.last?.comment, amount: amount)
     }
 
     private func addActivityLog(context: ActivityLogContext) async -> Error? {

diff --git a/Splito/UI/Home/ActivityLog/ActivityLogView.swift b/Splito/UI/Home/ActivityLog/ActivityLogView.swift
@@ -287,8 +287,9 @@ private struct ActivityLogDescriptionView: View {
 
     @ViewBuilder
     private func expenseCommentAddedDescription() -> some View {
+        let comment = activityLog.comment ?? "Some comment"
         highlightedText(actionUserName) + disabledText(" commented on") + highlightedText(" \"\(activityLog.expenseName ?? "")\"") +
-        disabledText(" in") + highlightedText(" \"\(groupName)\".")
+        disabledText(" in") + highlightedText(" \"\(groupName)\":") + disabledText(" \"\(comment)\".")
     }
 
     @ViewBuilder