Remove isUserStoredEventDeleted which isn't needed anymore

Infomaniak · Jun 6, 2024 · efe6ee8 · efe6ee8
1 parent e1e9448
commit efe6ee8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/app/src/main/java/com/infomaniak/mail/data/models/calendar/CalendarEventResponse.kt b/app/src/main/java/com/infomaniak/mail/data/models/calendar/CalendarEventResponse.kt
@@ -40,12 +40,10 @@ class CalendarEventResponse() : EmbeddedRealmObject {
 
     constructor(
         userStoredEvent: CalendarEvent?,
-        isUserStoredEventDeleted: Boolean,
         attachmentEvent: CalendarEvent?,
         attachmentEventMethod: String?,
     ) : this() {
         this.userStoredEvent = userStoredEvent
-        this.isUserStoredEventDeleted = isUserStoredEventDeleted
         this.attachmentEvent = attachmentEvent
         this._attachmentEventMethod = attachmentEventMethod
     }
@@ -70,7 +68,6 @@ class CalendarEventResponse() : EmbeddedRealmObject {
     fun everythingButAttendeesIsTheSame(other: CalendarEventResponse?): Boolean {
         if (other == null) return false
 
-        if (isUserStoredEventDeleted != other.isUserStoredEventDeleted) return false
         if (_attachmentEventMethod != other._attachmentEventMethod) return false
 
         val c1 = calendarEvent
@@ -89,15 +86,13 @@ class CalendarEventResponse() : EmbeddedRealmObject {
         other as CalendarEventResponse
 
         if (userStoredEvent != other.userStoredEvent) return false
-        if (isUserStoredEventDeleted != other.isUserStoredEventDeleted) return false
         if (attachmentEvent != other.attachmentEvent) return false
 
         return _attachmentEventMethod == other._attachmentEventMethod
     }
 
     override fun hashCode(): Int {
         var result = userStoredEvent?.hashCode() ?: 0
-        result = 31 * result + isUserStoredEventDeleted.hashCode()
         result = 31 * result + (attachmentEvent?.hashCode() ?: 0)
         result = 31 * result + (_attachmentEventMethod?.hashCode() ?: 0)
 

diff --git a/app/src/test/java/com/infomaniak/mail/CalendarEventResponseTest.kt b/app/src/test/java/com/infomaniak/mail/CalendarEventResponseTest.kt
@@ -21,6 +21,7 @@ import com.infomaniak.mail.data.models.calendar.Attendee
 import com.infomaniak.mail.data.models.calendar.Attendee.AttendanceState
 import com.infomaniak.mail.data.models.calendar.CalendarEvent
 import com.infomaniak.mail.data.models.calendar.CalendarEventResponse
+import com.infomaniak.mail.data.models.calendar.CalendarEventResponse.AttachmentEventMethod
 import com.infomaniak.mail.data.models.message.Body
 import com.infomaniak.mail.data.models.message.Message
 import com.infomaniak.mail.ui.main.thread.ThreadAdapter
@@ -141,10 +142,11 @@ class CalendarEventResponseTest {
 
     private fun getBasicCalendarEventResponse(
         userStoredEvent: CalendarEvent,
-        isUserStoredEventDeleted: Boolean,
+        hasCanceledEventMethod: Boolean,
     ): CalendarEventResponse {
         val attachmentEvent = getBasicCalendarEvent(AttendanceState.NEEDS_ACTION)
-        return CalendarEventResponse(userStoredEvent, isUserStoredEventDeleted, attachmentEvent, "REQUEST")
+        val method = if (hasCanceledEventMethod) AttachmentEventMethod.CANCEL.name else AttachmentEventMethod.REQUEST.name
+        return CalendarEventResponse(userStoredEvent, attachmentEvent, method)
     }
 
     companion object {