feat: Include more data from the fetched sentry transactions and impr…

…ove pagination
xponential-asia · Oct 14, 2022 · e476e50 · e476e50
1 parent 5b8e5de
commit e476e50
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 9 deletions.
diff --git a/packages/medusa-plugin-sentry/src/api/index.ts b/packages/medusa-plugin-sentry/src/api/index.ts
@@ -10,6 +10,7 @@ import { SentryOptions, SentryWebHookOptions } from '../types';
 import sentryTransactionsHandler from './handlers/sentry-transaction';
 import sentryTransactionEventsHandler from './handlers/sentry-transaction-events';
 import sentryWebHookHandler from './handlers/sentry-web-hook';
+
 export default function (rootDirectory, pluginOptions: SentryOptions): Router {
 	const router = Router();
 

diff --git a/packages/medusa-plugin-sentry/src/services/sentry.ts b/packages/medusa-plugin-sentry/src/services/sentry.ts
@@ -60,7 +60,7 @@ export default class SentryService extends TransactionBaseService {
 		perPage = perPage ?? 100;
 
 		const queryParams = {
-			field: 'transaction',
+			field: ['transaction', 'tpm()', 'p50()', 'p75()', 'p95()', 'failure_rate', 'apdex()'],
 			per_page: Number(perPage),
 			project,
 			query: `event.type:transaction${query ? ' AND ' + query : ''}`,
@@ -202,30 +202,48 @@ export default class SentryService extends TransactionBaseService {
 			params: searchParams,
 		});
 
-		const nextCursor: string = SentryService.buildNextCursor(headers['link']);
+		const nextCursor = SentryService.buildNextCursor(headers['link']);
+		const currentCursor = SentryService.buildCurrentCursor(headers['link'], perPage)
 
 		let prevCursor: string;
-		if (nextCursor) {
-			prevCursor = SentryService.buildPrevCursor(nextCursor, perPage);
+		if (currentCursor) {
+			prevCursor = SentryService.buildPrevCursor(currentCursor, perPage);
 		}
 
 		return { data, meta, prev_cursor: prevCursor, next_cursor: nextCursor };
 	}
 
-	protected static buildNextCursor(link: string): string {
-		let result = '';
+	protected static buildNextCursor(link: string): string | undefined {
+		let result;
+
+		const nextCursorMatch = link?.match(/.*cursor="(.*)"$/);
+		const hasResults = link?.match(/.*results="(.*)";/);
+		if (hasResults && hasResults[1] === 'true') {
+			if (nextCursorMatch && nextCursorMatch[1]) {
+				result = nextCursorMatch[1]?.split(',')[0];
+			}
+		}
+
+		return result;
+	}
+
+	protected static buildCurrentCursor(link: string, perPage: number): string | undefined {
+		let result;
 
 		const nextCursorMatch = link?.match(/.*cursor="(.*)"$/);
 		if (nextCursorMatch && nextCursorMatch[1]) {
 			result = nextCursorMatch[1]?.split(',')[0];
 		}
 
-		return result;
+		return this.buildPrevCursor(result, perPage)
 	}
 
-	protected static buildPrevCursor(nextCursor: string, perPage: number): string {
+	protected static buildPrevCursor(nextCursor: string, perPage: number): string | undefined {
 		const parts = nextCursor.split(':');
-		const prevCursorItems = Math.max(0, Number(parts[1]) - perPage * 2);
+		const prevCursorItems = Number(parts[1]) - perPage;
+		if (prevCursorItems < 0) {
+			return;
+		}
 		return `${parts[0]}:${prevCursorItems}:${parts[2]}`;
 	}
 }