mirrors/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey.git synced 2025-04-29 10:06:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: fix time zone for CustomEmojiService test (!909)

Browse source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/909

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
This commit is contained in:
Marie 2025-02-18 23:25:54 +00:00
commit 0bec7fe2a2
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/backend/src/core/CustomEmojiService.ts
View file

@ -520,11 +520,11 @@ export class CustomEmojiService implements OnApplicationShutdown {
const q = params.query; const q = params.query;
if (q.updatedAtFrom) { if (q.updatedAtFrom) {
// noIndexScan // noIndexScan
builder.andWhere('CAST(emoji.updatedAt AS DATE) >= :updateAtFrom', { updateAtFrom: q.updatedAtFrom }); builder.andWhere('CAST(emoji.updatedAt AS DATE) >= :updatedAtFrom', { updatedAtFrom: q.updatedAtFrom });
} }
if (q.updatedAtTo) { if (q.updatedAtTo) {
// noIndexScan // noIndexScan
builder.andWhere('CAST(emoji.updatedAt AS DATE) <= :updateAtTo', { updateAtTo: q.updatedAtTo }); builder.andWhere('CAST(emoji.updatedAt AS DATE) <= :updatedAtTo', { updatedAtTo: q.updatedAtTo });
} }
if (q.name) { if (q.name) {
builder.andWhere('emoji.name ~~ ANY(ARRAY[:...name])', { name: multipleWordsToQuery(q.name) }); builder.andWhere('emoji.name ~~ ANY(ARRAY[:...name])', { name: multipleWordsToQuery(q.name) });

2
packages/backend/test/unit/CustomEmojiService.ts
View file

@ -17,6 +17,7 @@ import { EmojisRepository } from '@/models/_.js';
import { MiEmoji } from '@/models/Emoji.js'; import { MiEmoji } from '@/models/Emoji.js';
import { CoreModule } from '@/core/CoreModule.js'; import { CoreModule } from '@/core/CoreModule.js';
import { DriveService } from '@/core//DriveService.js'; import { DriveService } from '@/core//DriveService.js';
import { DataSource } from 'typeorm';
describe('CustomEmojiService', () => { describe('CustomEmojiService', () => {
let app: TestingModule; let app: TestingModule;
@ -48,6 +49,7 @@ describe('CustomEmojiService', () => {
service = app.get<CustomEmojiService>(CustomEmojiService); service = app.get<CustomEmojiService>(CustomEmojiService);
emojisRepository = app.get<EmojisRepository>(DI.emojisRepository); emojisRepository = app.get<EmojisRepository>(DI.emojisRepository);
idService = app.get<IdService>(IdService); idService = app.get<IdService>(IdService);
await app.get<DataSource>(DI.db).query("set session time zone 'UTC'");
}); });
describe('fetchEmojis', () => { describe('fetchEmojis', () => {