more backward compatible error response, but still useful message

Author: googsvg

src/main/kotlin/com/nylas/models/CreateEventRequest.kt

@@ -235,14 +235,21 @@ data class CreateEventRequest(
         /**
          * Builds the [Timespan] object.
          * @return [Timespan] object.
-         * @throws IllegalArgumentException if endTime is not after startTime.
+         * @throws NylasApiError if endTime is not after startTime.
          */
         fun build(): Timespan {
           // Validate that endTime must be after startTime
-          require(endTime > startTime) {
-            "Invalid Timespan: endTime ($endTime) must be after startTime ($startTime). " +
-              "Timespan events require a positive duration. " +
-              "For point-in-time events, use CreateEventRequest.When.Time instead."
+          if (endTime <= startTime) {
+            throw NylasApiError(
+              type = "invalid_request_error",
+              message = "Invalid request: Timespan events require endTime to be after startTime",
+              statusCode = 400,
+              requestId = null,
+              providerError = null,
+              validationErrors = mapOf(
+                "when.end_time" to "End time ($endTime) must be after start time ($startTime). For point-in-time events, use CreateEventRequest.When.Time instead."
+              )
+            )
           }
           return Timespan(startTime, endTime, startTimezone, endTimezone)
         }

src/main/kotlin/com/nylas/models/UpdateEventRequest.kt

@@ -277,19 +277,24 @@ data class UpdateEventRequest(
         /**
          * Builds the [Timespan] object.
          * @return [Timespan] object.
-         * @throws IllegalArgumentException if both startTime and endTime are provided and endTime is not after startTime.
+         * @throws NylasApiError if both startTime and endTime are provided and endTime is not after startTime.
          */
         fun build(): Timespan {
           // Validate that if both times are set, endTime must be after startTime
           // Local variables for smart-cast null safety
           val start = startTime
           val end = endTime
-          if (start != null && end != null) {
-            require(end > start) {
-              "Invalid Timespan: endTime ($end) must be after startTime ($start). " +
-                "Timespan events require a positive duration. " +
-                "For point-in-time events, use UpdateEventRequest.When.Time instead."
-            }
+          if (start != null && end != null && end <= start) {
+            throw NylasApiError(
+              type = "invalid_request_error",
+              message = "Invalid request: Timespan events require endTime to be after startTime",
+              statusCode = 400,
+              requestId = null,
+              providerError = null,
+              validationErrors = mapOf(
+                "when.end_time" to "End time ($end) must be after start time ($start). For point-in-time events, use UpdateEventRequest.When.Time instead."
+              )
+            )
           }
           return Timespan(startTime, endTime, startTimezone, endTimezone)
         }

src/test/kotlin/com/nylas/resources/EventsTests.kt

@@ -511,28 +511,34 @@ class EventsTests {
 
     @Test
     fun `UpdateEventRequest Timespan with zero duration throws exception`() {
-      val exception = org.junit.jupiter.api.assertThrows<IllegalArgumentException> {
+      val exception = org.junit.jupiter.api.assertThrows<NylasApiError> {
         UpdateEventRequest.When.Timespan.Builder()
           .startTime(1620000000)
           .endTime(1620000000)
           .build()
       }
 
-      assert(exception.message!!.contains("endTime (1620000000) must be after startTime (1620000000)"))
-      assert(exception.message!!.contains("For point-in-time events, use UpdateEventRequest.When.Time instead"))
+      assertEquals(400, exception.statusCode)
+      assert(exception.message.contains("endTime to be after startTime"))
+      assert(exception.validationErrors != null)
+      assert(exception.validationErrors!!["when.end_time"]!!.contains("End time (1620000000) must be after start time (1620000000)"))
+      assert(exception.validationErrors!!["when.end_time"]!!.contains("For point-in-time events, use UpdateEventRequest.When.Time instead"))
     }
 
     @Test
     fun `UpdateEventRequest Timespan with negative duration throws exception`() {
-      val exception = org.junit.jupiter.api.assertThrows<IllegalArgumentException> {
+      val exception = org.junit.jupiter.api.assertThrows<NylasApiError> {
         UpdateEventRequest.When.Timespan.Builder()
           .startTime(1620003600)
           .endTime(1620000000)
           .build()
       }
 
-      assert(exception.message!!.contains("endTime (1620000000) must be after startTime (1620003600)"))
-      assert(exception.message!!.contains("Timespan events require a positive duration"))
+      assertEquals(400, exception.statusCode)
+      assert(exception.message.contains("endTime to be after startTime"))
+      assert(exception.validationErrors != null)
+      assert(exception.validationErrors!!["when.end_time"]!!.contains("End time (1620000000) must be after start time (1620003600)"))
+      assert(exception.validationErrors!!["when.end_time"]!!.contains("For point-in-time events, use UpdateEventRequest.When.Time instead"))
     }
 
     @Test
@@ -586,24 +592,30 @@ class EventsTests {
 
     @Test
     fun `CreateEventRequest Timespan with zero duration throws exception`() {
-      val exception = org.junit.jupiter.api.assertThrows<IllegalArgumentException> {
+      val exception = org.junit.jupiter.api.assertThrows<NylasApiError> {
         CreateEventRequest.When.Timespan.Builder(1620000000, 1620000000)
           .build()
       }
 
-      assert(exception.message!!.contains("endTime (1620000000) must be after startTime (1620000000)"))
-      assert(exception.message!!.contains("For point-in-time events, use CreateEventRequest.When.Time instead"))
+      assertEquals(400, exception.statusCode)
+      assert(exception.message.contains("endTime to be after startTime"))
+      assert(exception.validationErrors != null)
+      assert(exception.validationErrors!!["when.end_time"]!!.contains("End time (1620000000) must be after start time (1620000000)"))
+      assert(exception.validationErrors!!["when.end_time"]!!.contains("For point-in-time events, use CreateEventRequest.When.Time instead"))
     }
 
     @Test
     fun `CreateEventRequest Timespan with negative duration throws exception`() {
-      val exception = org.junit.jupiter.api.assertThrows<IllegalArgumentException> {
+      val exception = org.junit.jupiter.api.assertThrows<NylasApiError> {
         CreateEventRequest.When.Timespan.Builder(1620003600, 1620000000)
           .build()
       }
 
-      assert(exception.message!!.contains("endTime (1620000000) must be after startTime (1620003600)"))
-      assert(exception.message!!.contains("Timespan events require a positive duration"))
+      assertEquals(400, exception.statusCode)
+      assert(exception.message.contains("endTime to be after startTime"))
+      assert(exception.validationErrors != null)
+      assert(exception.validationErrors!!["when.end_time"]!!.contains("End time (1620000000) must be after start time (1620003600)"))
+      assert(exception.validationErrors!!["when.end_time"]!!.contains("For point-in-time events, use CreateEventRequest.When.Time instead"))
     }
 
     @Test