mirror of
https://github.com/roleypoly/roleypoly.git
synced 2025-04-24 19:39:11 +00:00
chore: remove legacy import -- fix tests, remove old code
This commit is contained in:
parent
c909b01767
commit
0e4a228f1b
3 changed files with 0 additions and 204 deletions
|
@ -1,19 +1,11 @@
|
||||||
jest.mock('../utils/discord');
|
jest.mock('../utils/discord');
|
||||||
jest.mock('../utils/legacy');
|
|
||||||
|
|
||||||
import { CategoryType, Features, Guild, GuildData, RoleSafety } from '@roleypoly/types';
|
import { CategoryType, Features, Guild, GuildData, RoleSafety } from '@roleypoly/types';
|
||||||
import { APIGuild, discordFetch } from '../utils/discord';
|
import { APIGuild, discordFetch } from '../utils/discord';
|
||||||
import {
|
|
||||||
fetchLegacyServer,
|
|
||||||
LegacyGuildData,
|
|
||||||
transformLegacyGuild,
|
|
||||||
} from '../utils/legacy';
|
|
||||||
import { configContext } from '../utils/testHelpers';
|
import { configContext } from '../utils/testHelpers';
|
||||||
import { getGuild, getGuildData, getGuildMember, getPickableRoles } from './getters';
|
import { getGuild, getGuildData, getGuildMember, getPickableRoles } from './getters';
|
||||||
|
|
||||||
const mockDiscordFetch = discordFetch as jest.Mock;
|
const mockDiscordFetch = discordFetch as jest.Mock;
|
||||||
const mockFetchLegacyServer = fetchLegacyServer as jest.Mock;
|
|
||||||
const mockTransformLegacyGuild = transformLegacyGuild as jest.Mock;
|
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
mockDiscordFetch.mockReset();
|
mockDiscordFetch.mockReset();
|
||||||
|
@ -99,111 +91,6 @@ describe('getGuildData', () => {
|
||||||
accessControl: expect.any(Object),
|
accessControl: expect.any(Object),
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('automatic legacy import', () => {
|
|
||||||
beforeEach(() => {
|
|
||||||
mockFetchLegacyServer.mockReset();
|
|
||||||
mockTransformLegacyGuild.mockImplementation(
|
|
||||||
jest.requireActual('../utils/legacy').transformLegacyGuild
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('attempts to import guild data from the legacy server', async () => {
|
|
||||||
const [config] = configContext();
|
|
||||||
|
|
||||||
const legacyGuildData: LegacyGuildData = {
|
|
||||||
id: '123',
|
|
||||||
message: 'Hello world!',
|
|
||||||
categories: [
|
|
||||||
{
|
|
||||||
id: '123',
|
|
||||||
name: 'test',
|
|
||||||
position: 0,
|
|
||||||
roles: ['role-1', 'role-2'],
|
|
||||||
hidden: false,
|
|
||||||
type: 'multi',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
};
|
|
||||||
|
|
||||||
mockFetchLegacyServer.mockReturnValue(legacyGuildData);
|
|
||||||
|
|
||||||
const expectedGuildData: GuildData = {
|
|
||||||
id: '123',
|
|
||||||
message: legacyGuildData.message,
|
|
||||||
auditLogWebhook: null,
|
|
||||||
accessControl: {
|
|
||||||
allowList: [],
|
|
||||||
blockList: [],
|
|
||||||
blockPending: true,
|
|
||||||
},
|
|
||||||
features: Features.LegacyGuild,
|
|
||||||
categories: [
|
|
||||||
{
|
|
||||||
id: expect.any(String),
|
|
||||||
name: 'test',
|
|
||||||
position: 0,
|
|
||||||
roles: ['role-1', 'role-2'],
|
|
||||||
hidden: false,
|
|
||||||
type: CategoryType.Multi,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
};
|
|
||||||
|
|
||||||
const currentGuildData = await getGuildData(config, '123');
|
|
||||||
expect(currentGuildData).toMatchObject(expectedGuildData);
|
|
||||||
|
|
||||||
const storedGuildData = await config.kv.guildData.get('123');
|
|
||||||
expect(storedGuildData).toMatchObject(expectedGuildData);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('fails an import and saves new guild data instead', async () => {
|
|
||||||
const [config] = configContext();
|
|
||||||
|
|
||||||
mockFetchLegacyServer.mockReturnValue(null);
|
|
||||||
|
|
||||||
const expectedGuildData: GuildData = {
|
|
||||||
id: '123',
|
|
||||||
message: '',
|
|
||||||
auditLogWebhook: null,
|
|
||||||
accessControl: {
|
|
||||||
allowList: [],
|
|
||||||
blockList: [],
|
|
||||||
blockPending: true,
|
|
||||||
},
|
|
||||||
features: Features.None,
|
|
||||||
categories: [],
|
|
||||||
};
|
|
||||||
|
|
||||||
const currentGuildData = await getGuildData(config, '123');
|
|
||||||
expect(currentGuildData).toMatchObject(expectedGuildData);
|
|
||||||
|
|
||||||
const storedGuildData = await config.kv.guildData.get('123');
|
|
||||||
expect(storedGuildData).toMatchObject(expectedGuildData);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('fails an import and prevents re-fetch', async () => {
|
|
||||||
const [config] = configContext();
|
|
||||||
|
|
||||||
mockFetchLegacyServer.mockReturnValue(null);
|
|
||||||
|
|
||||||
await getGuildData(config, '123');
|
|
||||||
await getGuildData(config, '123');
|
|
||||||
expect(mockFetchLegacyServer).toHaveBeenCalledTimes(1);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('errors gracefully', async () => {
|
|
||||||
const [config] = configContext();
|
|
||||||
|
|
||||||
mockFetchLegacyServer.mockImplementationOnce(() => {
|
|
||||||
throw new Error('test');
|
|
||||||
});
|
|
||||||
|
|
||||||
await getGuildData(config, '123');
|
|
||||||
await getGuildData(config, '123');
|
|
||||||
expect(mockFetchLegacyServer).toHaveBeenCalledTimes(1);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('getGuildMember', () => {
|
describe('getGuildMember', () => {
|
||||||
|
|
|
@ -7,7 +7,6 @@ import {
|
||||||
discordFetch,
|
discordFetch,
|
||||||
getHighestRole,
|
getHighestRole,
|
||||||
} from '@roleypoly/api/src/utils/discord';
|
} from '@roleypoly/api/src/utils/discord';
|
||||||
import { fetchLegacyServer, transformLegacyGuild } from '@roleypoly/api/src/utils/legacy';
|
|
||||||
import { evaluatePermission, permissions } from '@roleypoly/misc-utils/hasPermission';
|
import { evaluatePermission, permissions } from '@roleypoly/misc-utils/hasPermission';
|
||||||
import {
|
import {
|
||||||
Category,
|
Category,
|
||||||
|
@ -98,27 +97,6 @@ export const getGuildData = async (config: Config, id: string): Promise<GuildDat
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
export const attemptLegacyImport = async (
|
|
||||||
config: Config,
|
|
||||||
id: string
|
|
||||||
): Promise<GuildData | null> => {
|
|
||||||
try {
|
|
||||||
const legacyGuildData = await fetchLegacyServer(config, id);
|
|
||||||
if (!legacyGuildData) {
|
|
||||||
// Means there is no legacy data.
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const transformed = transformLegacyGuild(legacyGuildData);
|
|
||||||
|
|
||||||
await config.kv.guildData.put(id, transformed);
|
|
||||||
return transformed;
|
|
||||||
} catch (e) {
|
|
||||||
console.error('attemptLegacyImport errored:', e);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
export const getGuildMember = async (
|
export const getGuildMember = async (
|
||||||
config: Config,
|
config: Config,
|
||||||
serverID: string,
|
serverID: string,
|
||||||
|
|
|
@ -1,69 +0,0 @@
|
||||||
import { Config } from '@roleypoly/api/src/utils/config';
|
|
||||||
import { getID } from '@roleypoly/api/src/utils/id';
|
|
||||||
import { sortBy } from '@roleypoly/misc-utils/sortBy';
|
|
||||||
import { CategoryType, Features, GuildData } from '@roleypoly/types';
|
|
||||||
|
|
||||||
export type LegacyCategory = {
|
|
||||||
id: string;
|
|
||||||
name: string;
|
|
||||||
roles: string[];
|
|
||||||
hidden: boolean;
|
|
||||||
type: 'single' | 'multi';
|
|
||||||
position: number;
|
|
||||||
};
|
|
||||||
|
|
||||||
export type LegacyGuildData = {
|
|
||||||
id: string;
|
|
||||||
categories: LegacyCategory[];
|
|
||||||
message: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const fetchLegacyServer = async (
|
|
||||||
config: Config,
|
|
||||||
id: string
|
|
||||||
): Promise<LegacyGuildData | null> => {
|
|
||||||
if (!config.importSharedKey) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const guildDataResponse = await fetch(
|
|
||||||
`https://beta.roleypoly.com/x/import-to-next/${id}`,
|
|
||||||
{
|
|
||||||
headers: {
|
|
||||||
authorization: `Shared ${config.importSharedKey}`,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
if (guildDataResponse.status === 404) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (guildDataResponse.status !== 200) {
|
|
||||||
throw new Error('Guild data fetch failed');
|
|
||||||
}
|
|
||||||
|
|
||||||
return await guildDataResponse.json();
|
|
||||||
};
|
|
||||||
|
|
||||||
export const transformLegacyGuild = (guild: LegacyGuildData): GuildData => {
|
|
||||||
return {
|
|
||||||
id: guild.id,
|
|
||||||
message: guild.message,
|
|
||||||
features: Features.LegacyGuild,
|
|
||||||
auditLogWebhook: null,
|
|
||||||
accessControl: {
|
|
||||||
allowList: [],
|
|
||||||
blockList: [],
|
|
||||||
blockPending: true,
|
|
||||||
},
|
|
||||||
categories: sortBy(Object.values(guild.categories), 'position').map(
|
|
||||||
(category, idx) => ({
|
|
||||||
...category,
|
|
||||||
id: getID(),
|
|
||||||
position: idx, // Reset positions by index. May have side-effects but oh well.
|
|
||||||
type: category.type === 'multi' ? CategoryType.Multi : CategoryType.Single,
|
|
||||||
})
|
|
||||||
),
|
|
||||||
};
|
|
||||||
};
|
|
Loading…
Add table
Reference in a new issue