feat(group): final fixes & more tests (#166)

clients/javascript/lib/gen_types/CalendarEventDTO.ts

@@ -81,6 +81,10 @@ export type CalendarEventDTO = {
    * UUID of the user
    */
   userId: ID
+  /**
+   * Optional group ID
+   */
+  groupId: ID | null
   /**
    * List of reminders
    */

clients/javascript/lib/gen_types/CreateEventRequestBody.ts

@@ -71,6 +71,12 @@ export type CreateEventRequestBody = {
    * This is automatically set when the event is created from a service
    */
   serviceId?: ID
+  /**
+   * Optional group UUID
+   * Allows to group events together (e.g. a project, a team, etc.)
+   * Default is None
+   */
+  groupId?: ID
   /**
    * Optional metadata (e.g. {"key": "value"})
    */

clients/javascript/lib/gen_types/EventGroup.ts

@@ -31,8 +31,4 @@ export type EventGroup = {
    * It allows to link a group of events to an outside entity
    */
   externalId: string | null
-  /**
-   * List of event IDs in the group
-   */
-  eventIds: Array<ID>
 }

clients/javascript/lib/gen_types/SearchEventsRequestBody.ts

@@ -24,7 +24,7 @@ export type SearchEventsRequestBody = {
   /**
    * Optional query on group ID
    */
-  groupId?: IDQuery
+  groupId?: ID
   /**
    * Optional query on start time - "lower than or equal", or "great than or equal" (UTC)
    */

clients/javascript/lib/gen_types/UpdateEventRequestBody.ts

@@ -62,6 +62,12 @@ export type UpdateEventRequestBody = {
    * Optional service UUID
    */
   serviceId?: ID
+  /**
+   * Optional group UUID
+   * Allows to group events together (e.g. a project, a team, etc.)
+   * Default is None
+   */
+  groupId?: ID
   /**
    * Optional list of exclusion dates for the recurrence rule
    */

clients/javascript/tests/calendarEvent.spec.ts

@@ -556,6 +556,30 @@ describe('CalendarEvent API', () => {
         expect(res.events.length).toBe(1)
         expect(res.events[0].id).toBe(metadataEventId1)
       })
+
+      it('should be search events on event group id', async () => {
+        const group = await adminClient.eventGroups.create(userId, {
+          calendarId,
+        })
+
+        const resCreate = await adminClient.events.create(userId, {
+          calendarId,
+          duration: 1000,
+          startTime: new Date(1000),
+          groupId: group.eventGroup.id,
+        })
+        expect(resCreate.event).toBeDefined()
+        expect(resCreate.event.calendarId).toBe(calendarId)
+
+        const resSearch = await adminClient.events.searchEvents({
+          userId,
+          groupId: group.eventGroup.id,
+        })
+
+        expect(resSearch.events.length).toBe(1)
+        expect(resSearch.events[0].id).toBe(resCreate.event.id)
+        expect(resSearch.events[0].groupId).toBe(group.eventGroup.id)
+      })
     })
 
     afterAll(async () => {

clients/rust/src/event.rs

@@ -132,6 +132,8 @@ impl CalendarEventClient {
             recurrence: input.recurrence,
             reminders: input.reminders,
             service_id: input.service_id,
+            // TODO
+            group_id: None,
             metadata: input.metadata,
         };
 
@@ -168,12 +170,14 @@ impl CalendarEventClient {
             parent_id: input.parent_id,
             external_id: input.external_id,
             busy: input.busy,
+            start_time: input.start_time,
             duration: input.duration,
             exdates: input.exdates,
             recurrence: input.rrule_options,
             reminders: input.reminders,
             service_id: input.service_id,
-            start_time: input.start_time,
+            // TODO
+            group_id: None,
             metadata: input.metadata,
         };
         self.base

crates/api/src/event/create_event.rs

@@ -47,6 +47,7 @@ pub async fn create_event_admin_controller(
         recurrence: body.recurrence,
         reminders: body.reminders,
         service_id: body.service_id,
+        group_id: body.group_id,
         metadata: body.metadata,
     };
 
@@ -80,6 +81,7 @@ pub async fn create_event_controller(
         user,
         reminders: body.reminders,
         service_id: body.service_id,
+        group_id: body.group_id,
         metadata: body.metadata,
     };
 
@@ -106,6 +108,7 @@ pub struct CreateEventUseCase {
     pub recurrence: Option<RRuleOptions>,
     pub reminders: Vec<CalendarEventReminder>,
     pub service_id: Option<ID>,
+    pub group_id: Option<ID>,
     pub metadata: Option<serde_json::Value>,
 }
 
@@ -183,7 +186,7 @@ impl UseCase for CreateEventUseCase {
             account_id: self.user.account_id.clone(),
             reminders: self.reminders.clone(),
             service_id: self.service_id.clone(),
-            group_id: None,
+            group_id: self.group_id.clone(),
             metadata: self.metadata.clone(),
         };
 

crates/api/src/event/search_events.rs

@@ -54,7 +54,7 @@ pub struct SearchEventsUseCase {
     pub parent_id: Option<IDQuery>,
 
     /// Optional query on the group ID
-    pub group_id: Option<IDQuery>,
+    pub group_id: Option<ID>,
 
     /// Optional query on start time - "lower than or equal", or "great than or equal" (UTC)
     pub start_time: Option<DateTimeQuery>,
@@ -143,14 +143,14 @@ impl UseCase for SearchEventsUseCase {
             .events
             .search_events(SearchEventsParams {
                 user_id: self.user_id.clone(),
-                calendar_ids: self.calendar_ids.clone(),
-                parent_id: self.parent_id.clone(),
-                group_id: self.group_id.clone(),
-                start_time: self.start_time.clone(),
-                end_time: self.end_time.clone(),
-                status: self.status.clone(),
-                updated_at: self.updated_at.clone(),
-                metadata: self.metadata.clone(),
+                calendar_ids: self.calendar_ids.take(),
+                parent_id: self.parent_id.take(),
+                group_id: self.group_id.take(),
+                start_time: self.start_time.take(),
+                end_time: self.end_time.take(),
+                status: self.status.take(),
+                updated_at: self.updated_at.take(),
+                metadata: self.metadata.take(),
             })
             .await;
 

crates/api/src/event/update_event.rs

@@ -54,6 +54,7 @@ pub async fn update_event_admin_controller(
         recurrence: body.recurrence,
         busy: body.busy,
         service_id: body.service_id,
+        group_id: body.group_id,
         exdates: body.exdates,
         metadata: body.metadata,
     };
@@ -89,6 +90,7 @@ pub async fn update_event_controller(
         recurrence: body.recurrence,
         busy: body.busy,
         service_id: body.service_id,
+        group_id: body.group_id,
         exdates: body.exdates,
         metadata: body.metadata,
     };
@@ -117,6 +119,7 @@ pub struct UpdateEventUseCase {
     pub reminders: Option<Vec<CalendarEventReminder>>,
     pub recurrence: Option<RRuleOptions>,
     pub service_id: Option<ID>,
+    pub group_id: Option<ID>,
     pub exdates: Option<Vec<DateTime<Utc>>>,
     pub metadata: Option<serde_json::Value>,
 }
@@ -173,6 +176,7 @@ impl UseCase for UpdateEventUseCase {
             exdates,
             reminders,
             service_id,
+            group_id,
             metadata,
         } = self;
 
@@ -279,6 +283,10 @@ impl UseCase for UpdateEventUseCase {
             e.external_id.clone_from(external_id);
         }
 
+        if group_id.is_some() {
+            e.group_id.clone_from(group_id);
+        }
+
         if location.is_some() {
             e.location.clone_from(location);
         }

crates/api/src/event_group/create_event_group.rs

@@ -93,7 +93,6 @@ impl UseCase for CreateEventGroupUseCase {
             calendar_id: calendar.id.clone(),
             user_id: self.user.id.clone(),
             account_id: self.user.account_id.clone(),
-            event_ids: vec![],
         };
 
         ctx.repos.event_groups.insert(&g).await?;

crates/api_structs/src/event/api.rs

@@ -115,6 +115,13 @@ pub mod create_event {
         #[ts(optional)]
         pub service_id: Option<ID>,
 
+        /// Optional group UUID
+        /// Allows to group events together (e.g. a project, a team, etc.)
+        /// Default is None
+        #[serde(default)]
+        #[ts(optional)]
+        pub group_id: Option<ID>,
+
         /// Optional metadata (e.g. {"key": "value"})
         #[serde(default)]
         #[ts(optional)]
@@ -270,7 +277,7 @@ pub mod search_events {
 
         /// Optional query on group ID
         #[ts(optional)]
-        pub group_id: Option<IDQuery>,
+        pub group_id: Option<ID>,
 
         /// Optional query on start time - "lower than or equal", or "great than or equal" (UTC)
         #[ts(optional)]
@@ -421,6 +428,13 @@ pub mod update_event {
         #[ts(optional)]
         pub service_id: Option<ID>,
 
+        /// Optional group UUID
+        /// Allows to group events together (e.g. a project, a team, etc.)
+        /// Default is None
+        #[serde(default)]
+        #[ts(optional)]
+        pub group_id: Option<ID>,
+
         /// Optional list of exclusion dates for the recurrence rule
         #[serde(default)]
         #[ts(optional, type = "Array<Date>")]

crates/api_structs/src/event/dtos.rs

@@ -76,6 +76,9 @@ pub struct CalendarEventDTO {
     /// UUID of the user
     pub user_id: ID,
 
+    /// Optional group ID
+    pub group_id: Option<ID>,
+
     /// List of reminders
     pub reminders: Vec<CalendarEventReminder>,
 
@@ -105,6 +108,7 @@ impl CalendarEventDTO {
             exdates: event.exdates,
             calendar_id: event.calendar_id,
             user_id: event.user_id,
+            group_id: event.group_id,
             reminders: event.reminders,
             metadata: event.metadata,
         }

crates/domain/src/event_group.rs

@@ -27,7 +27,4 @@ pub struct EventGroup {
     /// External ID - this is an ID external to the system
     /// It allows to link a group of events to an outside entity
     pub external_id: Option<String>,
-
-    /// List of event IDs in the group
-    pub event_ids: Vec<ID>,
 }

crates/infra/src/repos/event/calendar_event/mod.rs

@@ -12,11 +12,12 @@ pub struct MostRecentCreatedServiceEvents {
     pub created: Option<i64>,
 }
 
+#[derive(Debug, Clone)]
 pub struct SearchEventsParams {
     pub user_id: ID,
     pub calendar_ids: Option<Vec<ID>>,
     pub parent_id: Option<IDQuery>,
-    pub group_id: Option<IDQuery>,
+    pub group_id: Option<ID>,
     pub start_time: Option<DateTimeQuery>,
     pub end_time: Option<DateTimeQuery>,
     pub status: Option<Vec<String>>,