Skip to content

Fix peers #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kristina-fefelova merged 2 commits into from
Oct 24, 2025
Merged

Fix peers #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a0317d
Fix peers
kristina-fefelova Oct 24, 2025
f9cdd3f
Add description
kristina-fefelova Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions common/changes/@hcengineering/communication-cockroach/fix-peers_2025-10-24-13-01.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@hcengineering/communication-cockroach",
"comment": "Fix peer create",
"type": "patch"
}
],
"packageName": "@hcengineering/communication-cockroach"
}
10 changes: 10 additions & 0 deletions common/changes/@hcengineering/communication-sdk-types/fix-peers_2025-10-24-13-01.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@hcengineering/communication-sdk-types",
"comment": "Fix peer create event",
"type": "patch"
}
],
"packageName": "@hcengineering/communication-sdk-types"
}
10 changes: 10 additions & 0 deletions common/changes/@hcengineering/communication-server/fix-peers_2025-10-24-13-01.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@hcengineering/communication-server",
"comment": "Fix peer create",
"type": "patch"
}
],
"packageName": "@hcengineering/communication-server"
}
5 changes: 3 additions & 2 deletions packages/cockroach/src/adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,10 @@ export class CockroachAdapter implements DbAdapter {
kind: PeerKind,
value: string,
extra: PeerExtra,
date: Date
date: Date,
options?: {newValue?: boolean}
): Promise<void> {
await this.peer.createPeer(workspaceId, cardId, kind, value, extra, date)
await this.peer.createPeer(workspaceId, cardId, kind, value, extra, date, options)
}

async removePeer (workspaceId: WorkspaceUuid,
Expand Down
21 changes: 18 additions & 3 deletions packages/cockroach/src/db/peer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ export class PeersDb extends BaseDb {
kind: PeerKind,
value: string,
extra: PeerExtra,
date: Date
date: Date,
options?: { newValue?: boolean }
): Promise<void> {
const db: DbModel<Domain.Peer> = {
workspace_id: workspaceId,
Expand All @@ -45,8 +46,22 @@ export class PeersDb extends BaseDb {
extra,
created: date
}
const { sql, values } = this.getInsertSql(Domain.Peer, db, [])
await this.execute(sql, values, 'insert peer')

if (options?.newValue === true) {
const { sql, values } = this.getInsertSql(Domain.Peer, db, [], {
conflictColumns: ['workspace_id', 'kind', 'value'],
conflictAction: 'DO NOTHING'
})
const result = await this.execute(sql, values, 'insert peer')
const count = result?.count ?? 0

if (count === 0) {
throw Error('Peer value already exists')
}
} else {
const { sql, values } = this.getInsertSql(Domain.Peer, db, [])
await this.execute(sql, values, 'insert peer')
}
}

async removePeer (workspaceId: WorkspaceUuid, cardId: CardID, kind: PeerKind, value: string): Promise<void> {
Expand Down
3 changes: 2 additions & 1 deletion packages/sdk-types/src/db.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ export interface DbAdapter {
kind: PeerKind,
value: string,
extra: PeerExtra,
date: Date
date: Date,
options?: {newValue?: boolean}
) => Promise<void>
removePeer: (workspaceId: WorkspaceUuid,
cardId: CardID,
Expand Down
3 changes: 3 additions & 0 deletions packages/sdk-types/src/events/peer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ export interface CreatePeerEvent extends BaseEvent {
kind: PeerKind
value: string
extra?: PeerExtra
options?: {
newValue?: boolean
}
date?: Date
}

Expand Down
5 changes: 5 additions & 0 deletions packages/server/src/middleware/validate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,11 @@ const CreatePeerEventSchema = BaseEventSchema.extend({
kind: z.string().nonempty(),
value: z.string().nonempty(),
extra: z.record(z.any()).optional(),
options: z
.object({
newValue: z.boolean().optional()
})
.optional(),
date: DateSchema
}).strict()

Expand Down