Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

docs(calendar): say a declined join request stands in the join API docs (#8673)

gbirman3d095527993e
diff --git a/apps/web/src/lib/service-clients/service-storage/generated/zod.ts b/apps/web/src/lib/service-clients/service-storage/generated/zod.ts
index 75c59df377..6ef691ccff 100644
--- a/apps/web/src/lib/service-clients/service-storage/generated/zod.ts
+++ b/apps/web/src/lib/service-clients/service-storage/generated/zod.ts
@@ -1825,8 +1825,9 @@ export const listJoinRequestsResponse = zod
/**
* @summary Ask the person who shared an event with one of the requester's channels
-to add them as a guest. Asking again while the request is pending changes
-nothing; asking after a decline reopens it.
+to add them as a guest. Asking again while the request is pending or
+accepted changes nothing; a declined request stands, so asking after a
+decline is refused with `request_declined`.
*/
export const requestToJoinParams = zod.object({
event_id: zod.uuid().describe('Shared calendar event entity id'),
diff --git a/apps/web/src/lib/service-clients/service-storage/openapi.json b/apps/web/src/lib/service-clients/service-storage/openapi.json
index 877827be06..340dfdf668 100644
--- a/apps/web/src/lib/service-clients/service-storage/openapi.json
+++ b/apps/web/src/lib/service-clients/service-storage/openapi.json
@@ -1054,7 +1054,7 @@
},
"post": {
"tags": ["calendar_events"],
- "summary": "Ask the person who shared an event with one of the requester's channels\nto add them as a guest. Asking again while the request is pending changes\nnothing; asking after a decline reopens it.",
+ "summary": "Ask the person who shared an event with one of the requester's channels\nto add them as a guest. Asking again while the request is pending or\naccepted changes nothing; a declined request stands, so asking after a\ndecline is refused with `request_declined`.",
"operationId": "request_to_join",
"parameters": [
{
@@ -1093,7 +1093,7 @@
}
},
"409": {
- "description": "Already on the requester's calendar, or the sharer cannot add guests",
+ "description": "Already on the requester's calendar, the sharer cannot add guests, or the sharer declined the requester's earlier request",
"content": {
"application/json": {
"schema": {
diff --git a/crates/calendar_events/src/domain/ports.rs b/crates/calendar_events/src/domain/ports.rs
index d4e9f03e8e..34bea2b4b3 100644
--- a/crates/calendar_events/src/domain/ports.rs
+++ b/crates/calendar_events/src/domain/ports.rs
@@ -582,8 +582,9 @@ pub trait CalendarRepository: Send + Sync + 'static {
) -> impl Future<Output = Result<Option<CalendarEventExport>, Report>> + Send;
/// Record a pending request from the requester to join `event_id`,
- /// reopening a declined one. Returns the request and whether it became
- /// pending just now, so a repeated ask does not notify the sharer twice.
+ /// leaving an existing one, whatever its status, as it is. Returns the
+ /// request and whether this call created it, so a repeated ask does not
+ /// notify the sharer twice.
fn open_join_request(
&self,
event_id: Uuid,
diff --git a/crates/calendar_events/src/inbound/join_request_router.rs b/crates/calendar_events/src/inbound/join_request_router.rs
index 2d1dfc10ac..9e97b2f2f5 100644
--- a/crates/calendar_events/src/inbound/join_request_router.rs
+++ b/crates/calendar_events/src/inbound/join_request_router.rs
@@ -165,8 +165,9 @@ pub struct CalendarJoinRequestsResponse {
}
/// Ask the person who shared an event with one of the requester's channels
-/// to add them as a guest. Asking again while the request is pending changes
-/// nothing; asking after a decline reopens it.
+/// to add them as a guest. Asking again while the request is pending or
+/// accepted changes nothing; a declined request stands, so asking after a
+/// decline is refused with `request_declined`.
#[tracing::instrument(skip_all, fields(event_id = %event_id), err)]
#[utoipa::path(
post,
@@ -177,7 +178,7 @@ pub struct CalendarJoinRequestsResponse {
(status = 200, description = "The requester's join request", body = CalendarJoinRequest),
(status = 401, description = "Authentication required"),
(status = 404, description = "Event not found or not shared with the requester", body = CalendarJoinRequestApiError),
- (status = 409, description = "Already on the requester's calendar, or the sharer cannot add guests", body = CalendarJoinRequestApiError),
+ (status = 409, description = "Already on the requester's calendar, the sharer cannot add guests, or the sharer declined the requester's earlier request", body = CalendarJoinRequestApiError),
(status = 500, description = "Join request failed", body = CalendarJoinRequestApiError),
)
)]
diff --git a/packages/sdk-docs/reference/generated/storage/types.gen/type-aliases/RequestToJoinErrors.md b/packages/sdk-docs/reference/generated/storage/types.gen/type-aliases/RequestToJoinErrors.md
index 05c25d75ef..72b5a9cd8f 100644
--- a/packages/sdk-docs/reference/generated/storage/types.gen/type-aliases/RequestToJoinErrors.md
+++ b/packages/sdk-docs/reference/generated/storage/types.gen/type-aliases/RequestToJoinErrors.md
@@ -8,5 +8,5 @@
| ------ | ------ | ------ |
| <a id="property-401"></a> `401` | `unknown` | Authentication required |
| <a id="property-404"></a> `404` | [`CalendarJoinRequestApiError`](CalendarJoinRequestApiError.md) | Event not found or not shared with the requester |
-| <a id="property-409"></a> `409` | [`CalendarJoinRequestApiError`](CalendarJoinRequestApiError.md) | Already on the requester's calendar, or the sharer cannot add guests |
+| <a id="property-409"></a> `409` | [`CalendarJoinRequestApiError`](CalendarJoinRequestApiError.md) | Already on the requester's calendar, the sharer cannot add guests, or the sharer declined the requester's earlier request |
| <a id="property-500"></a> `500` | [`CalendarJoinRequestApiError`](CalendarJoinRequestApiError.md) | Join request failed |
diff --git a/packages/sdk/generated/storage/sdk.gen.ts b/packages/sdk/generated/storage/sdk.gen.ts
index d08726b92d..62b861e0d0 100644
--- a/packages/sdk/generated/storage/sdk.gen.ts
+++ b/packages/sdk/generated/storage/sdk.gen.ts
@@ -226,8 +226,9 @@ export class Sdk extends HeyApiClient {
/**
* Ask the person who shared an event with one of the requester's channels
- * to add them as a guest. Asking again while the request is pending changes
- * nothing; asking after a decline reopens it.
+ * to add them as a guest. Asking again while the request is pending or
+ * accepted changes nothing; a declined request stands, so asking after a
+ * decline is refused with `request_declined`.
*/
public requestToJoin<ThrowOnError extends boolean = false>(options: Options<RequestToJoinData, ThrowOnError>): RequestResult<RequestToJoinResponses, RequestToJoinErrors, ThrowOnError> {
return (options.client ?? this.client).post<RequestToJoinResponses, RequestToJoinErrors, ThrowOnError>({ url: '/calendar-events/{event_id}/join-requests', ...options });
diff --git a/packages/sdk/generated/storage/types.gen.ts b/packages/sdk/generated/storage/types.gen.ts
index d3051ca8cd..8c20bec30d 100644
--- a/packages/sdk/generated/storage/types.gen.ts
+++ b/packages/sdk/generated/storage/types.gen.ts
@@ -16016,7 +16016,7 @@ export type RequestToJoinErrors = {
*/
404: CalendarJoinRequestApiError;
/**
- * Already on the requester's calendar, or the sharer cannot add guests
+ * Already on the requester's calendar, the sharer cannot add guests, or the sharer declined the requester's earlier request
*/
409: CalendarJoinRequestApiError;
/**
diff --git a/packages/sdk/specs/storage.json b/packages/sdk/specs/storage.json
index 877827be06..340dfdf668 100644
--- a/packages/sdk/specs/storage.json
+++ b/packages/sdk/specs/storage.json
@@ -1054,7 +1054,7 @@
},
"post": {
"tags": ["calendar_events"],
- "summary": "Ask the person who shared an event with one of the requester's channels\nto add them as a guest. Asking again while the request is pending changes\nnothing; asking after a decline reopens it.",
+ "summary": "Ask the person who shared an event with one of the requester's channels\nto add them as a guest. Asking again while the request is pending or\naccepted changes nothing; a declined request stands, so asking after a\ndecline is refused with `request_declined`.",
"operationId": "request_to_join",
"parameters": [
{
@@ -1093,7 +1093,7 @@
}
},
"409": {
- "description": "Already on the requester's calendar, or the sharer cannot add guests",
+ "description": "Already on the requester's calendar, the sharer cannot add guests, or the sharer declined the requester's earlier request",
"content": {
"application/json": {
"schema": {