Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Response } from '#/server/api/admin_get_user_list';
import { getAssetPublicPath } from '@/platform/asset';
import { AssetType } from '#/constants';
import { USER_TABLE_NAME, User, UserProperty } from '@/constants/db_definition';
import excludeProperty from '#/utils/exclude_property';
import excludeProperties from '#/utils/exclude_properties';
import { UNUSED_2FA_SECRET_PREFIX } from '@/constants';
import { Context } from '../constants';

Expand Down Expand Up @@ -46,7 +46,7 @@ export default async (ctx: Context) => {
);
return ctx.success<Response>(
userList.map((user) => ({
...excludeProperty(user, [UserProperty.TWO_FA_SECRET]),
...excludeProperties(user, [UserProperty.TWO_FA_SECRET]),
avatar: getAssetPublicPath(user.avatar, AssetType.USER_AVATAR),
twoFAEnabled: Boolean(
user.twoFASecret &&
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { AssetType } from '#/constants';
import { Response } from '#/server/api/get_exploration';
import { getDB } from '@/db';
import { getSingerListInMusicIds } from '@/db/singer';
import excludeProperty from '#/utils/exclude_property';
import excludeProperties from '#/utils/exclude_properties';
import {
Music,
MusicProperty,
Expand Down Expand Up @@ -116,14 +116,14 @@ export default async (ctx: Context) => {
cover: getAssetPublicPath(m.cover, AssetType.MUSIC_COVER),
singers: musicSingerList
.filter((s) => s.musicId === m.id)
.map((s) => excludeProperty(s, ['musicId'])),
.map((s) => excludeProperties(s, ['musicId'])),
})),
singerList: singerList.map((s) => ({
...s,
avatar: getAssetPublicPath(s.avatar, AssetType.SINGER_AVATAR),
})),
publicMusicbillList: publicMusicbillList.map((mb) => ({
...excludeProperty(mb, [MusicbillProperty.USER_ID]),
...excludeProperties(mb, [MusicbillProperty.USER_ID]),
cover: getAssetPublicPath(mb.cover, AssetType.MUSICBILL_COVER),
user: musicbillCreateUserList.find((u) => mb.userId === u.id)!,
})),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ALIAS_DIVIDER, AssetType } from '#/constants';
import { Response } from '#/server/api/get_music';
import { ExceptionCode } from '#/constants/exception';
import excludeProperty from '#/utils/exclude_property';
import excludeProperties from '#/utils/exclude_properties';
import {
Music,
MusicProperty,
Expand Down Expand Up @@ -85,46 +85,42 @@ export default async (ctx: Context) => {
)
: undefined,
]);
const musicIdMapSingerList: {
[key: string]: (Pick<
const musicIdMapSingerList: Record<string, (Pick<
Singer,
SingerProperty.ID | SingerProperty.NAME | SingerProperty.AVATAR
> & {
aliases: string[];
})[];
} = {};
})[]> = {};
allSingerList.forEach((s) => {
if (!musicIdMapSingerList[s.musicId]) {
musicIdMapSingerList[s.musicId] = [];
}
musicIdMapSingerList[s.musicId].push({
...excludeProperty(s, ['musicId']),
...excludeProperties(s, ['musicId']),
aliases: s.aliases ? s.aliases.split(ALIAS_DIVIDER) : [],
});
});

const musicIdMapMusic: {
[key: string]: Pick<
const musicIdMapMusic: Record<string, Pick<
Music,
MusicProperty.ID | MusicProperty.NAME | MusicProperty.COVER
> & {
singers: Pick<
Singer,
SingerProperty.ID | SingerProperty.NAME | SingerProperty.AVATAR
>[];
};
} = {};
}> = {};
musicList.forEach((m) => {
musicIdMapMusic[m.id] = {
...m,
singers: (musicIdMapSingerList[m.id] || []).map((s) =>
excludeProperty(s, ['aliases']),
excludeProperties(s, ['aliases']),
),
};
});

return ctx.success<Response>({
...excludeProperty(music, [MusicProperty.CREATE_USER_ID]),
...excludeProperties(music, [MusicProperty.CREATE_USER_ID]),
cover: getAssetPublicPath(music.cover, AssetType.MUSIC_COVER),
asset: getAssetPublicPath(music.asset, AssetType.MUSIC),
aliases: music.aliases ? music.aliases.split(ALIAS_DIVIDER) : [],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ALIAS_DIVIDER, AssetType } from '#/constants';
import { ExceptionCode } from '#/constants/exception';
import { SEARCH_KEYWORD_MAX_LENGTH } from '#/constants/music';
import excludeProperty from '#/utils/exclude_property';
import excludeProperties from '#/utils/exclude_properties';
import {
Music,
MusicProperty,
Expand Down Expand Up @@ -150,17 +150,18 @@ export default async (ctx: Context) => {
musicList.map((m) => m.id),
[SingerProperty.ID, SingerProperty.NAME, SingerProperty.ALIASES],
);
const musicIdMapSingerList: {
[key: string]: (Pick<Singer, SingerProperty.ID | SingerProperty.NAME> & {
const musicIdMapSingerList: Record<
string,
(Pick<Singer, SingerProperty.ID | SingerProperty.NAME> & {
aliases: string[];
})[];
} = {};
})[]
> = {};
singerList.forEach((s) => {
if (!musicIdMapSingerList[s.musicId]) {
musicIdMapSingerList[s.musicId] = [];
}
musicIdMapSingerList[s.musicId].push({
...excludeProperty(s, ['musicId']),
...excludeProperties(s, ['musicId']),
aliases: s.aliases ? s.aliases.split(ALIAS_DIVIDER) : [],
});
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ALIAS_DIVIDER } from '#/constants';
import { ExceptionCode } from '#/constants/exception';
import { SEARCH_KEYWORD_MAX_LENGTH } from '#/constants/music';
import excludeProperty from '#/utils/exclude_property';
import excludeProperties from '#/utils/exclude_properties';
import {
MUSIC_PLAY_RECORD_TABLE_NAME,
MUSIC_SINGER_RELATION_TABLE_NAME,
Expand Down Expand Up @@ -166,14 +166,12 @@ export default async (ctx: Context) => {
musicPlayRecordList.map((m) => m.id),
[SingerProperty.ID, SingerProperty.NAME],
);
const musicIdMapSingerList: {
[key: string]: Pick<Singer, SingerProperty.ID | SingerProperty.NAME>[];
} = {};
const musicIdMapSingerList: Record<string, Pick<Singer, SingerProperty.ID | SingerProperty.NAME>[]> = {};
singerList.forEach((s) => {
if (!musicIdMapSingerList[s.musicId]) {
musicIdMapSingerList[s.musicId] = [];
}
musicIdMapSingerList[s.musicId].push(excludeProperty(s, ['musicId']));
musicIdMapSingerList[s.musicId].push(excludeProperties(s, ['musicId']));
});

return ctx.success({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Response } from '#/server/api/get_musicbill';
import { ALIAS_DIVIDER, AssetType } from '#/constants';
import { ExceptionCode } from '#/constants/exception';
import { getSingerListInMusicIds } from '@/db/singer';
import excludeProperty from '#/utils/exclude_property';
import excludeProperties from '#/utils/exclude_properties';
import { getAssetPublicPath } from '@/platform/asset';
import { getDB } from '@/db';
import {
Expand Down Expand Up @@ -130,22 +130,31 @@ export default async (ctx: Context) => {
[id],
);

const musicIdMapSingers: Record<string, {
const musicIdMapSingers: Record<
string,
{
id: string;
name: string;
aliases: string[];
}[]> = {};
avatar: string;
}[]
> = {};
if (musicList.length) {
const allSingerList = await getSingerListInMusicIds(
Array.from(new Set(musicList.map((m) => m.id))),
[SingerProperty.ID, SingerProperty.NAME, SingerProperty.ALIASES],
[
SingerProperty.ID,
SingerProperty.NAME,
SingerProperty.ALIASES,
SingerProperty.AVATAR,
],
);
for (const singer of allSingerList) {
if (!musicIdMapSingers[singer.musicId]) {
musicIdMapSingers[singer.musicId] = [];
}
musicIdMapSingers[singer.musicId].push({
...excludeProperty(singer, ['musicId']),
...excludeProperties(singer, ['musicId']),
aliases: singer.aliases ? singer.aliases.split(ALIAS_DIVIDER) : [],
});
}
Expand All @@ -171,7 +180,10 @@ export default async (ctx: Context) => {
musicList: musicList.map((m) => ({
...m,
aliases: m.aliases ? m.aliases.split(ALIAS_DIVIDER) : [],
singers: musicIdMapSingers[m.id] || [],
singers: (musicIdMapSingers[m.id] || []).map((s) => ({
...s,
avatar: getAssetPublicPath(s.avatar, AssetType.SINGER_AVATAR),
})),
cover: getAssetPublicPath(m.cover, AssetType.MUSIC_COVER),
asset: getAssetPublicPath(m.asset, AssetType.MUSIC),
})),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
UserProperty,
} from '@/constants/db_definition';
import { getDB } from '@/db';
import excludeProperty from '#/utils/exclude_property';
import excludeProperties from '#/utils/exclude_properties';
import { Context } from '../constants';

export default async (ctx: Context) => {
Expand Down Expand Up @@ -101,7 +101,7 @@ export default async (ctx: Context) => {
sharedUserList: sharedUserList
.filter((u) => u.musicbillId === mb.id)
.map((u) => ({
...excludeProperty(u, [SharedMusicbillProperty.MUSICBILL_ID]),
...excludeProperties(u, [SharedMusicbillProperty.MUSICBILL_ID]),
avatar: getAssetPublicPath(u.avatar, AssetType.USER_AVATAR),
accepted: !!u.accepted,
})),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Response } from '#/server/api/get_public_musicbill';
import { ALIAS_DIVIDER, AssetType } from '#/constants';
import { ExceptionCode } from '#/constants/exception';
import excludeProperty from '#/utils/exclude_property';
import excludeProperties from '#/utils/exclude_properties';
import {
Music,
MusicProperty,
Expand Down Expand Up @@ -78,13 +78,11 @@ export default async (ctx: Context) => {
}),
]);

const musicIdMapSingers: {
[key: string]: {
const musicIdMapSingers: Record<string, {
id: string;
name: string;
aliases: string[];
}[];
} = {};
}[]> = {};
if (musicList.length) {
const allSingerList = await getSingerListInMusicIds(
Array.from(new Set(musicList.map((m) => m.id))),
Expand All @@ -95,14 +93,14 @@ export default async (ctx: Context) => {
musicIdMapSingers[singer.musicId] = [];
}
musicIdMapSingers[singer.musicId].push({
...excludeProperty(singer, ['musicId']),
...excludeProperties(singer, ['musicId']),
aliases: singer.aliases ? singer.aliases.split(ALIAS_DIVIDER) : [],
});
}
}

return ctx.success<Response>({
...excludeProperty(musicbill, [
...excludeProperties(musicbill, [
MusicbillProperty.PUBLIC,
MusicbillProperty.USER_ID,
]),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ExceptionCode } from '#/constants/exception';
import { Response } from '#/server/api/get_public_musicbill_collection_list';
import { SEARCH_KEYWORD_MAX_LENGTH } from '#/constants/musicbill';
import excludeProperty from '#/utils/exclude_property';
import excludeProperties from '#/utils/exclude_properties';
import {
PUBLIC_MUSICBILL_COLLECTION_TABLE_NAME,
MUSICBILL_TABLE_NAME,
Expand Down Expand Up @@ -139,7 +139,7 @@ export default async (ctx: Context) => {
return ctx.success<Response>({
total,
collectionList: collectionList.map((mb) => ({
...excludeProperty(mb, [MusicbillProperty.USER_ID]),
...excludeProperties(mb, [MusicbillProperty.USER_ID]),
user: userList.find((u) => u.id === mb.userId)!,
cover: getAssetPublicPath(mb.cover, AssetType.MUSICBILL_COVER),
})),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ALIAS_DIVIDER, AssetType } from '#/constants';
import { ExceptionCode } from '#/constants/exception';
import { Response } from '#/server/api/get_singer';
import excludeProperty from '#/utils/exclude_property';
import excludeProperties from '#/utils/exclude_properties';
import {
MUSIC_SINGER_RELATION_TABLE_NAME,
MUSIC_TABLE_NAME,
Expand Down Expand Up @@ -84,29 +84,38 @@ export default async (ctx: Context) => {
),
]);

const musicIdMapSingers: {
[key: string]: (Pick<Singer, SingerProperty.ID | SingerProperty.NAME> & {
const musicIdMapSingers: Record<
string,
(Pick<
Singer,
SingerProperty.ID | SingerProperty.NAME | SingerProperty.AVATAR
> & {
aliases: string[];
})[];
} = {};
})[]
> = {};
if (musicList.length) {
const allSingerList = await getSingerListInMusicIds(
Array.from(new Set(musicList.map((m) => m.id))),
[SingerProperty.ID, SingerProperty.NAME, SingerProperty.ALIASES],
[
SingerProperty.ID,
SingerProperty.NAME,
SingerProperty.ALIASES,
SingerProperty.AVATAR,
],
);
allSingerList.forEach((s) => {
if (!musicIdMapSingers[s.musicId]) {
musicIdMapSingers[s.musicId] = [];
}
musicIdMapSingers[s.musicId].push({
...excludeProperty(s, ['musicId']),
...excludeProperties(s, ['musicId']),
aliases: s.aliases ? s.aliases.split(ALIAS_DIVIDER) : [],
});
});
}

return ctx.success<Response>({
...excludeProperty(singer, [SingerProperty.CREATE_USER_ID]),
...excludeProperties(singer, [SingerProperty.CREATE_USER_ID]),
avatar: getAssetPublicPath(singer.avatar, AssetType.SINGER_AVATAR),
aliases: singer.aliases ? singer.aliases.split(ALIAS_DIVIDER) : [],
createUser: createUser!,
Expand All @@ -115,7 +124,10 @@ export default async (ctx: Context) => {
cover: getAssetPublicPath(m.cover, AssetType.MUSIC_COVER),
asset: getAssetPublicPath(m.asset, AssetType.MUSIC),
aliases: m.aliases ? m.aliases.split(ALIAS_DIVIDER) : [],
singers: musicIdMapSingers[m.id] || [],
singers: (musicIdMapSingers[m.id] || []).map((s) => ({
...s,
avatar: getAssetPublicPath(s.avatar, AssetType.SINGER_AVATAR),
})),
})),

editable: !!editable,
Expand Down
Loading