Skip to content

Commit 1ccddc9

Browse files
bosiraphaelWeiko
authored andcommitted
5483 modify messagechannel syncstatus (#5484)
- Closes #5483 - Fix seeds - Add default value to syncSubStatus
1 parent 802ba08 commit 1ccddc9

File tree

4 files changed

+64
-58
lines changed

4 files changed

+64
-58
lines changed

packages/twenty-server/src/database/typeorm-seeds/workspace/connected-account.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export const seedConnectedAccount = async (
4141
refreshToken: 'exampleRefreshToken',
4242
accessToken: 'exampleAccessToken',
4343
provider: 'google',
44-
handle: 'incoming',
44+
handle: '[email protected]',
4545
},
4646
{
4747
id: DEV_SEED_CONNECTED_ACCOUNT_IDS.JONY,
@@ -53,7 +53,7 @@ export const seedConnectedAccount = async (
5353
refreshToken: 'exampleRefreshToken',
5454
accessToken: 'exampleAccessToken',
5555
provider: 'google',
56-
handle: 'incoming',
56+
handle: '[email protected]',
5757
},
5858
{
5959
id: DEV_SEED_CONNECTED_ACCOUNT_IDS.PHIL,
@@ -65,7 +65,7 @@ export const seedConnectedAccount = async (
6565
refreshToken: 'exampleRefreshToken',
6666
accessToken: 'exampleAccessToken',
6767
provider: 'google',
68-
handle: 'incoming',
68+
handle: '[email protected]',
6969
},
7070
])
7171
.execute();

packages/twenty-server/src/database/typeorm-seeds/workspace/message-channel-message-associations.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export const seedMessageChannelMessageAssociation = async (
4141
messageThreadId: DEV_SEED_MESSAGE_THREAD_IDS.MESSAGE_THREAD_1,
4242
messageExternalId: null,
4343
messageId: DEV_SEED_MESSAGE_IDS.MESSAGE_1,
44-
messageChannelId: DEV_SEED_MESSAGE_CHANNEL_IDS.TIM_INCOMING,
44+
messageChannelId: DEV_SEED_MESSAGE_CHANNEL_IDS.TIM,
4545
},
4646
{
4747
id: DEV_SEED_MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_IDS.MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_2,
@@ -52,7 +52,7 @@ export const seedMessageChannelMessageAssociation = async (
5252
messageThreadId: DEV_SEED_MESSAGE_THREAD_IDS.MESSAGE_THREAD_2,
5353
messageExternalId: null,
5454
messageId: DEV_SEED_MESSAGE_IDS.MESSAGE_2,
55-
messageChannelId: DEV_SEED_MESSAGE_CHANNEL_IDS.TIM_INCOMING,
55+
messageChannelId: DEV_SEED_MESSAGE_CHANNEL_IDS.TIM,
5656
},
5757
{
5858
id: DEV_SEED_MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_IDS.MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_3,
@@ -63,7 +63,7 @@ export const seedMessageChannelMessageAssociation = async (
6363
messageThreadId: DEV_SEED_MESSAGE_THREAD_IDS.MESSAGE_THREAD_1,
6464
messageExternalId: null,
6565
messageId: DEV_SEED_MESSAGE_IDS.MESSAGE_3,
66-
messageChannelId: DEV_SEED_MESSAGE_CHANNEL_IDS.TIM_INCOMING,
66+
messageChannelId: DEV_SEED_MESSAGE_CHANNEL_IDS.TIM,
6767
},
6868
])
6969
.execute();

packages/twenty-server/src/database/typeorm-seeds/workspace/message-channels.ts

+17-45
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
import { EntityManager } from 'typeorm';
22

33
import { DEV_SEED_CONNECTED_ACCOUNT_IDS } from 'src/database/typeorm-seeds/workspace/connected-account';
4+
import { MessageChannelSyncSubStatus } from 'src/modules/messaging/standard-objects/message-channel.workspace-entity';
45

56
const tableName = 'messageChannel';
67

78
export const DEV_SEED_MESSAGE_CHANNEL_IDS = {
8-
TIM_INCOMING: '20202020-9b80-4c2c-a597-383db48de1d6',
9-
TIM_OUTGOING: '20202020-09ed-4eb9-8b23-62aa4fd81d83',
10-
JONY_INCOMING: '20202020-5ffe-4b32-814a-983d5e4911cd',
11-
JONY_OUTGOING: '20202020-9dad-4329-8180-62647a2d7510',
12-
PHIL_INCOMING: '20202020-e2f1-49b5-85d2-5d3a3386990c',
13-
PHIL_OUTGOING: '20202020-fdff-438f-9132-7d5f216dfc4d',
9+
TIM: '20202020-9b80-4c2c-a597-383db48de1d6',
10+
JONY: '20202020-5ffe-4b32-814a-983d5e4911cd',
11+
PHIL: '20202020-e2f1-49b5-85d2-5d3a3386990c',
1412
};
1513

1614
export const seedMessageChannel = async (
@@ -30,74 +28,48 @@ export const seedMessageChannel = async (
3028
'connectedAccountId',
3129
'handle',
3230
'visibility',
31+
'syncSubStatus',
3332
])
3433
.orIgnore()
3534
.values([
3635
{
37-
id: DEV_SEED_MESSAGE_CHANNEL_IDS.TIM_INCOMING,
36+
id: DEV_SEED_MESSAGE_CHANNEL_IDS.TIM,
3837
createdAt: new Date(),
3938
updatedAt: new Date(),
4039
deletedAt: null,
4140
isContactAutoCreationEnabled: true,
4241
type: 'email',
4342
connectedAccountId: DEV_SEED_CONNECTED_ACCOUNT_IDS.TIM,
44-
handle: 'outgoing',
43+
handle: '[email protected]',
4544
visibility: 'share_everything',
45+
syncSubStatus:
46+
MessageChannelSyncSubStatus.FULL_MESSAGES_LIST_FETCH_PENDING,
4647
},
4748
{
48-
id: DEV_SEED_MESSAGE_CHANNEL_IDS.TIM_OUTGOING,
49-
createdAt: new Date(),
50-
updatedAt: new Date(),
51-
deletedAt: null,
52-
isContactAutoCreationEnabled: true,
53-
type: 'email',
54-
connectedAccountId: DEV_SEED_CONNECTED_ACCOUNT_IDS.TIM,
55-
handle: 'incoming',
56-
visibility: 'share_everything',
57-
},
58-
{
59-
id: DEV_SEED_MESSAGE_CHANNEL_IDS.JONY_INCOMING,
49+
id: DEV_SEED_MESSAGE_CHANNEL_IDS.JONY,
6050
createdAt: new Date(),
6151
updatedAt: new Date(),
6252
deletedAt: null,
6353
isContactAutoCreationEnabled: true,
6454
type: 'email',
6555
connectedAccountId: DEV_SEED_CONNECTED_ACCOUNT_IDS.JONY,
66-
handle: 'outgoing',
67-
visibility: 'share_everything',
68-
},
69-
{
70-
id: DEV_SEED_MESSAGE_CHANNEL_IDS.JONY_OUTGOING,
71-
createdAt: new Date(),
72-
updatedAt: new Date(),
73-
deletedAt: null,
74-
isContactAutoCreationEnabled: true,
75-
type: 'email',
76-
connectedAccountId: DEV_SEED_CONNECTED_ACCOUNT_IDS.JONY,
77-
handle: 'incoming',
78-
visibility: 'share_everything',
79-
},
80-
{
81-
id: DEV_SEED_MESSAGE_CHANNEL_IDS.PHIL_INCOMING,
82-
createdAt: new Date(),
83-
updatedAt: new Date(),
84-
deletedAt: null,
85-
isContactAutoCreationEnabled: true,
86-
type: 'email',
87-
connectedAccountId: DEV_SEED_CONNECTED_ACCOUNT_IDS.PHIL,
88-
handle: 'outgoing',
56+
handle: '[email protected]',
8957
visibility: 'share_everything',
58+
syncSubStatus:
59+
MessageChannelSyncSubStatus.FULL_MESSAGES_LIST_FETCH_PENDING,
9060
},
9161
{
92-
id: DEV_SEED_MESSAGE_CHANNEL_IDS.PHIL_OUTGOING,
62+
id: DEV_SEED_MESSAGE_CHANNEL_IDS.PHIL,
9363
createdAt: new Date(),
9464
updatedAt: new Date(),
9565
deletedAt: null,
9666
isContactAutoCreationEnabled: true,
9767
type: 'email',
9868
connectedAccountId: DEV_SEED_CONNECTED_ACCOUNT_IDS.PHIL,
99-
handle: 'incoming',
69+
handle: '[email protected]',
10070
visibility: 'share_everything',
71+
syncSubStatus:
72+
MessageChannelSyncSubStatus.FULL_MESSAGES_LIST_FETCH_PENDING,
10173
},
10274
])
10375
.execute();

packages/twenty-server/src/modules/messaging/standard-objects/message-channel.workspace-entity.ts

+41-7
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,17 @@ import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-
1818
import { WorkspaceRelation } from 'src/engine/twenty-orm/decorators/workspace-relation.decorator';
1919

2020
export enum MessageChannelSyncStatus {
21+
// TO BE DEPRECATED
2122
PENDING = 'PENDING',
22-
ONGOING = 'ONGOING',
2323
SUCCEEDED = 'SUCCEEDED',
2424
FAILED = 'FAILED',
25+
26+
// NEW STATUSES
27+
NOT_SYNCED = 'NOT_SYNCED',
28+
ONGOING = 'ONGOING',
29+
COMPLETED = 'COMPLETED',
30+
FAILED_INSUFFICIENT_PERMISSIONS = 'FAILED_INSUFFICIENT_PERMISSIONS',
31+
FAILED_UNKNOWN = 'FAILED_UNKNOWN',
2532
}
2633

2734
export enum MessageChannelSyncSubStatus {
@@ -163,18 +170,13 @@ export class MessageChannelWorkspaceEntity extends BaseWorkspaceEntity {
163170
description: 'Sync status',
164171
icon: 'IconStatusChange',
165172
options: [
173+
// TO BE DEPRECATED: PENDING, SUCCEEDED, FAILED
166174
{
167175
value: MessageChannelSyncStatus.PENDING,
168176
label: 'Pending',
169177
position: 0,
170178
color: 'blue',
171179
},
172-
{
173-
value: MessageChannelSyncStatus.ONGOING,
174-
label: 'Ongoing',
175-
position: 1,
176-
color: 'yellow',
177-
},
178180
{
179181
value: MessageChannelSyncStatus.SUCCEEDED,
180182
label: 'Succeeded',
@@ -187,6 +189,37 @@ export class MessageChannelWorkspaceEntity extends BaseWorkspaceEntity {
187189
position: 3,
188190
color: 'red',
189191
},
192+
// NEW STATUSES
193+
{
194+
value: MessageChannelSyncStatus.ONGOING,
195+
label: 'Ongoing',
196+
position: 1,
197+
color: 'yellow',
198+
},
199+
{
200+
value: MessageChannelSyncStatus.NOT_SYNCED,
201+
label: 'Not Synced',
202+
position: 4,
203+
color: 'blue',
204+
},
205+
{
206+
value: MessageChannelSyncStatus.COMPLETED,
207+
label: 'Completed',
208+
position: 5,
209+
color: 'green',
210+
},
211+
{
212+
value: MessageChannelSyncStatus.FAILED_INSUFFICIENT_PERMISSIONS,
213+
label: 'Failed Insufficient Permissions',
214+
position: 6,
215+
color: 'red',
216+
},
217+
{
218+
value: MessageChannelSyncStatus.FAILED_UNKNOWN,
219+
label: 'Failed Unknown',
220+
position: 7,
221+
color: 'red',
222+
},
190223
],
191224
})
192225
@WorkspaceIsNullable()
@@ -230,6 +263,7 @@ export class MessageChannelWorkspaceEntity extends BaseWorkspaceEntity {
230263
color: 'orange',
231264
},
232265
],
266+
defaultValue: `'${MessageChannelSyncSubStatus.FULL_MESSAGES_LIST_FETCH_PENDING}'`,
233267
})
234268
syncSubStatus: MessageChannelSyncSubStatus;
235269

0 commit comments

Comments
 (0)