fix: map GitHub IDs for manual credit additions

Author: PavelKopecky

src/extensions/endpoints/admin-sponsors/src/index.ts

@@ -4,6 +4,7 @@ import type { EventContext } from '@directus/types';
 import { isAxiosError } from 'axios';
 import type { Request, RequestHandler, Router } from 'express';
 import Joi from 'joi';
+import { redirectGithubId } from '../../../lib/src/add-credits.js';
 import { asyncWrapper } from '../../../lib/src/async-wrapper.js';
 import { getGithubApiClient } from '../../../lib/src/github-api-client.js';
 import { validate } from '../../../lib/src/middlewares/validate.js';
@@ -177,10 +178,11 @@ export const createAdminSponsorsEndpoint = (queryService: QueryService, githubLo
 		const accountability = (req as Request & { accountability: EventContext['accountability'] }).accountability;
 		const input = req.body as ManualAdditionInput;
 		const isPayment = input.type === 'payment';
+		const githubId = redirectGithubId(input.githubId);
 		let githubLogin: string;
 
 		try {
-			githubLogin = await githubLoginResolver(input.githubId, context);
+			githubLogin = await githubLoginResolver(githubId, context);
 		} catch (error) {
 			const status = isAxiosError(error) ? error.response?.status : undefined;
 
@@ -189,13 +191,13 @@ export const createAdminSponsorsEndpoint = (queryService: QueryService, githubLo
 				return;
 			}
 
-			context.logger.error({ githubId: input.githubId, status }, 'GitHub account lookup failed.');
+			context.logger.error({ githubId, status }, 'GitHub account lookup failed.');
 			res.status(503).send('GitHub account lookup is temporarily unavailable.');
 			return;
 		}
 
 		await context.database('gp_credits_additions').insert({
-			github_id: input.githubId,
+			github_id: githubId,
 			amount: input.credits,
 			reason: isPayment ? 'one_time_sponsorship' : 'other',
 			meta: JSON.stringify(isPayment

src/extensions/endpoints/admin-sponsors/src/queries.ts

@@ -1,5 +1,5 @@
 import type { Knex } from 'knex';
-import { SOURCE_ID_TO_TARGET_ID } from '../../../lib/src/add-credits.js';
+import { redirectGithubId, SOURCE_ID_TO_TARGET_ID } from '../../../lib/src/add-credits.js';
 import type {
 	AccountsQuery,
 	EventsQuery,
@@ -112,7 +112,7 @@ export const applySearch = (query: Knex.QueryBuilder, search: string | undefined
 	const value = `%${search}%`;
 	query.where((builder) => {
 		if (/^\d+$/.test(search)) {
-			builder.where('additions.github_id', search);
+			builder.where('additions.github_id', redirectGithubId(search));
 		} else {
 			builder.where('additions.github_id', 'like', value);
 		}
@@ -131,7 +131,7 @@ export const applyManualSearch = (query: Knex.QueryBuilder, search: string | und
 	const value = `%${search}%`;
 	query.where((builder) => {
 		if (/^\d+$/.test(search)) {
-			builder.where('additions.github_id', search);
+			builder.where('additions.github_id', redirectGithubId(search));
 		} else {
 			builder.where('additions.github_id', 'like', value);
 		}

src/extensions/endpoints/admin-sponsors/test/queries.test.ts

@@ -4,7 +4,7 @@ import sinon from 'sinon';
 import { applyManualSearch, applySearch, fillChartPoints, normalizeManualAddition, normalizeSponsorAccount, normalizeSponsorshipEvent, utcMonthSql } from '../src/queries.js';
 
 describe('sponsor query normalization', () => {
-	it('matches numeric GitHub IDs exactly while searching event usernames', () => {
+	it('matches mapped numeric GitHub IDs exactly while searching event usernames', () => {
 		const builder = {
 			where: sinon.stub().returnsThis(),
 			orWhere: sinon.stub().returnsThis(),
@@ -13,15 +13,15 @@ describe('sponsor query normalization', () => {
 
 		const where = sinon.spy((callback: (builder: Knex.QueryBuilder) => void) => callback(builder as unknown as Knex.QueryBuilder));
 
-		applySearch({ where } as unknown as Knex.QueryBuilder, '123');
+		applySearch({ where } as unknown as Knex.QueryBuilder, '66716858');
 
-		expect(builder.where.calledOnceWithExactly('additions.github_id', '123')).to.equal(true);
-		expect(builder.orWhere.calledWithExactly('current_sponsors.github_login', 'like', '%123%')).to.equal(true);
-		expect(builder.orWhere.calledWithExactly('directus_users.github_username', 'like', '%123%')).to.equal(true);
-		expect(builder.orWhereRaw.calledWithExactly(`NULLIF(JSON_UNQUOTE(JSON_EXTRACT(additions.meta, '$.githubLogin')), '') LIKE ?`, [ '%123%' ])).to.equal(true);
+		expect(builder.where.calledOnceWithExactly('additions.github_id', '6209808')).to.equal(true);
+		expect(builder.orWhere.calledWithExactly('current_sponsors.github_login', 'like', '%66716858%')).to.equal(true);
+		expect(builder.orWhere.calledWithExactly('directus_users.github_username', 'like', '%66716858%')).to.equal(true);
+		expect(builder.orWhereRaw.calledWithExactly(`NULLIF(JSON_UNQUOTE(JSON_EXTRACT(additions.meta, '$.githubLogin')), '') LIKE ?`, [ '%66716858%' ])).to.equal(true);
 	});
 
-	it('matches numeric GitHub IDs exactly while searching manual-addition usernames', () => {
+	it('matches mapped numeric GitHub IDs exactly while searching manual-addition usernames', () => {
 		const builder = {
 			where: sinon.stub().returnsThis(),
 			orWhere: sinon.stub().returnsThis(),
@@ -30,12 +30,12 @@ describe('sponsor query normalization', () => {
 
 		const where = sinon.spy((callback: (builder: Knex.QueryBuilder) => void) => callback(builder as unknown as Knex.QueryBuilder));
 
-		applyManualSearch({ where } as unknown as Knex.QueryBuilder, '123', 'added-by-expression');
+		applyManualSearch({ where } as unknown as Knex.QueryBuilder, '66716858', 'added-by-expression');
 
-		expect(builder.where.calledOnceWithExactly('additions.github_id', '123')).to.equal(true);
-		expect(builder.orWhere.calledWithExactly('current_sponsors.github_login', 'like', '%123%')).to.equal(true);
-		expect(builder.orWhere.calledWithExactly('dashboard_users.github_username', 'like', '%123%')).to.equal(true);
-		expect(builder.orWhereRaw.calledWithExactly(`NULLIF(JSON_UNQUOTE(JSON_EXTRACT(additions.meta, '$.githubLogin')), '') LIKE ?`, [ '%123%' ])).to.equal(true);
+		expect(builder.where.calledOnceWithExactly('additions.github_id', '6209808')).to.equal(true);
+		expect(builder.orWhere.calledWithExactly('current_sponsors.github_login', 'like', '%66716858%')).to.equal(true);
+		expect(builder.orWhere.calledWithExactly('dashboard_users.github_username', 'like', '%66716858%')).to.equal(true);
+		expect(builder.orWhereRaw.calledWithExactly(`NULLIF(JSON_UNQUOTE(JSON_EXTRACT(additions.meta, '$.githubLogin')), '') LIKE ?`, [ '%66716858%' ])).to.equal(true);
 	});
 
 	it('groups monthly chart timestamps in UTC', () => {