xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2024-11-03 21:04:03 +08:00
Code Actions Projects Activity

Fixig setting and random photo test #683

Browse Source
This commit is contained in:
Patrik J. Braun 2023-07-30 13:25:31 +02:00
parent e113062208
commit a408f1b24d
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/model/database/SearchManager.ts
View File

@ -356,7 +356,7 @@ export class SearchManager {
if (!sortings || !Array.isArray(sortings)) { if (!sortings || !Array.isArray(sortings)) {
return query; return query;
} }
if (sortings.includes(SortingMethods.random) && sortings.length > 0) { if (sortings.includes(SortingMethods.random) && sortings.length > 1) {
throw new Error('Error during applying sorting: Can\' randomize and also sort the result. Bad input:' + sortings.map(s => SortingMethods[s]).join(', ')); throw new Error('Error during applying sorting: Can\' randomize and also sort the result. Bad input:' + sortings.map(s => SortingMethods[s]).join(', '));
} }
for (const sort of sortings) { for (const sort of sortings) {

2
test/backend/integration/routers/admin/SettingsRouter.ts
View File

@ -46,7 +46,9 @@ describe('SettingsRouter', () => {
result.body.should.be.a('object'); result.body.should.be.a('object');
should.equal(result.body.error, null); should.equal(result.body.error, null);
(result.body.result as ServerConfig).Environment.upTime = null; (result.body.result as ServerConfig).Environment.upTime = null;
(result.body.result as ServerConfig).Environment.sendMailAvailable = null;
originalSettings.Environment.upTime = null; originalSettings.Environment.upTime = null;
originalSettings.Environment.sendMailAvailable = null;
result.body.result.should.deep.equal(JSON.parse(JSON.stringify(originalSettings.toJSON({ result.body.result.should.deep.equal(JSON.parse(JSON.stringify(originalSettings.toJSON({
attachState: true, attachState: true,
attachVolatile: true, attachVolatile: true,

4
test/backend/unit/model/sql/SearchManager.spec.ts
View File

@ -1406,14 +1406,14 @@ describe('SearchManager', (sqlHelper: DBTestHelper) => {
} as TextSearch; } as TextSearch;
// eslint-disable-next-line // eslint-disable-next-line
expect(await sm.getNMedia(query, [SortingMethods.random], 1, true)).to.not.exist; expect(await sm.getNMedia(query, [SortingMethods.random], 1, true)).to.deep.equalInAnyOrder([]);
query = ({ query = ({
text: 'wookiees', text: 'wookiees',
matchType: TextSearchQueryMatchTypes.exact_match, matchType: TextSearchQueryMatchTypes.exact_match,
type: SearchQueryTypes.keyword type: SearchQueryTypes.keyword
} as TextSearch); } as TextSearch);
expect(Utils.clone(await sm.getNMedia(query, [SortingMethods.random], 1, true))).to.deep.equalInAnyOrder(searchifyMedia(pFaceLess)); expect(Utils.clone(await sm.getNMedia(query, [SortingMethods.random], 1, true))).to.deep.equalInAnyOrder([searchifyMedia(pFaceLess)]);
}); });
}); });