Introduce ID for the WebHookHistoryMessage struct (#206)

pepakriz · Apr 8, 2024 · c421173 · c421173
1 parent 0559007
commit c421173
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/dashboard/src/pages/web-hook-history.tsx b/dashboard/src/pages/web-hook-history.tsx
@@ -76,6 +76,7 @@ const App = () => {
 	const { loading, error, data } = useSubscription<GetWebHookHistorySubscriptionSubscription>(gql`
 		subscription GetWebHookHistorySubscription {
 			webHookHistory {
+				id
 				createdAt
 				data
 				event
@@ -104,10 +105,7 @@ const App = () => {
 							</TableHead>
 							<TableBody>
 								{data?.webHookHistory.map((webHookHistory) => (
-									<Row
-										key={webHookHistory.createdAt}
-										webHookHistory={webHookHistory}
-									/>
+									<Row key={webHookHistory.id} webHookHistory={webHookHistory} />
 								))}
 							</TableBody>
 						</Table>

diff --git a/schema.graphql b/schema.graphql
@@ -47,6 +47,7 @@ type Queue {
 }
 
 type WebHookHistoryRequest {
+	id: String!
 	createdAt: Int!
 	status: WebHookHistoryStatus!
 	event: String

diff --git a/server/src/WebHookServer.ts b/server/src/WebHookServer.ts
@@ -26,9 +26,6 @@ interface MergeRequestAssignee {
 }
 
 interface MergeRequestHook {
-	// project: {
-	// 	id: number;
-	// };
 	object_attributes: {
 		id: number;
 		iid: number;
@@ -51,6 +48,7 @@ const containsAssignedUser = (mergeRequest: MergeRequestHook, user: User): boole
 };
 
 type WebHookHistoryMessage = {
+	id: string;
 	status: WebHookHistoryStatus;
 	event?: string;
 	data?: string;
@@ -161,6 +159,7 @@ export class WebHookServer {
 			);
 			app.post('/', async (req, res) => {
 				let webHookHistoryMessage: WebHookHistoryMessage = {
+					id: uuid(),
 					status: WebHookHistoryStatus.UNAUTHORIZED,
 					createdAt: Math.floor(Date.now() / 1000),
 				};