Skip to content

Let's use AI to Earn!

feat: content default group not allowed delete (#375)

nevine1163c5d493f
diff --git a/project/backend/apps/aitoearn-channel/src/core/platforms/platforms.controller.ts b/project/backend/apps/aitoearn-channel/src/core/platforms/platforms.controller.ts
index 40abb958..dc0876af 100644
--- a/project/backend/apps/aitoearn-channel/src/core/platforms/platforms.controller.ts
+++ b/project/backend/apps/aitoearn-channel/src/core/platforms/platforms.controller.ts
@@ -10,7 +10,6 @@ export class PlatformController {
private readonly logger = new Logger(PlatformController.name)
constructor(private readonly platformService: PlatformService) {}
- // @NatsMessagePattern('platform.user.accounts')
@ApiDoc({
summary: 'List User Accounts',
})
diff --git a/project/backend/apps/aitoearn-channel/src/core/platforms/platforms.service.ts b/project/backend/apps/aitoearn-channel/src/core/platforms/platforms.service.ts
index 040669f9..5b19a4f9 100644
--- a/project/backend/apps/aitoearn-channel/src/core/platforms/platforms.service.ts
+++ b/project/backend/apps/aitoearn-channel/src/core/platforms/platforms.service.ts
@@ -1,6 +1,7 @@
import { Inject, Injectable, Logger } from '@nestjs/common'
import { AccountType, AppException, ResponseCode } from '@yikart/common'
import { RedisService } from '@yikart/redis'
+import { AccountStatus } from '../../libs/database/schema/account.schema'
import { SocialMediaError } from '../../libs/exception/base'
import { AccountService } from '../account/account.service'
import { PlatformBaseService } from './base.service'
@@ -25,9 +26,14 @@ export class PlatformService {
for (const account of accounts) {
const svc = this.platformServices[account.type]
if (svc) {
- const status = await svc.getAccessTokenStatus(account._id.toString())
- this.logger.log(`${account.type} access token status: ${status}`)
- account.status = status
+ try {
+ const status = await svc.getAccessTokenStatus(account._id.toString())
+ account.status = status
+ }
+ catch (error) {
+ this.logger.error(`user:[${userId}] -- ${account.type} get access token status failed: ${error}`)
+ account.status = AccountStatus.ABNORMAL
+ }
}
}
return accounts
diff --git a/project/backend/apps/aitoearn-server/src/content/materialGroup.controller.ts b/project/backend/apps/aitoearn-server/src/content/materialGroup.controller.ts
index f9aac610..d1cba0a6 100644
--- a/project/backend/apps/aitoearn-server/src/content/materialGroup.controller.ts
+++ b/project/backend/apps/aitoearn-server/src/content/materialGroup.controller.ts
@@ -57,6 +57,11 @@ export class MaterialGroupController {
if (!materialGroup || materialGroup.userId !== token.id) {
throw new AppException(ResponseCode.MaterialGroupNotFound, 'Material Group not found')
}
+ if (
+ materialGroup.isDefault
+ ) {
+ throw new AppException(ResponseCode.MaterialGroupDefaultNotAllowed, 'Default material group cannot be deleted')
+ }
const res = await this.materialGroupService.delGroup(id)
return res
}
diff --git a/project/backend/apps/aitoearn-server/src/content/mediaGroup.controller.ts b/project/backend/apps/aitoearn-server/src/content/mediaGroup.controller.ts
index c4ea6835..3f621841 100644
--- a/project/backend/apps/aitoearn-server/src/content/mediaGroup.controller.ts
+++ b/project/backend/apps/aitoearn-server/src/content/mediaGroup.controller.ts
@@ -63,6 +63,11 @@ export class MediaGroupController {
if (!mediaGroup || mediaGroup.userId !== token.id) {
throw new AppException(ResponseCode.MediaGroupNotFound, 'Media Group not found')
}
+ if (
+ mediaGroup.isDefault
+ ) {
+ throw new AppException(ResponseCode.MediaGroupDefaultNotAllowed, 'Default media group cannot be deleted')
+ }
const res = await this.mediaGroupService.del(id)
return res
}
diff --git a/project/backend/libs/common/src/enums/response-code.enum.ts b/project/backend/libs/common/src/enums/response-code.enum.ts
index 4b468dcd..2b61e723 100755
--- a/project/backend/libs/common/src/enums/response-code.enum.ts
+++ b/project/backend/libs/common/src/enums/response-code.enum.ts
@@ -48,11 +48,13 @@ export enum ResponseCode {
// 12700-12799: media(媒体文件)
MediaNotFound = 12700,
MediaGroupNotFound = 12701,
+ MediaGroupDefaultNotAllowed = 12702,
// 12800-12899: material(素材)
MaterialNotFound = 12800,
MaterialGroupNotFound = 12801,
MaterialTaskNotFound = 12802,
+ MaterialGroupDefaultNotAllowed = 12803,
// 12900-12999: content(内容组合)
MaterialGroupEmpty = 12900,
diff --git a/project/backend/libs/common/src/i18n/messages.ts b/project/backend/libs/common/src/i18n/messages.ts
index 3704f104..108bdbd6 100644
--- a/project/backend/libs/common/src/i18n/messages.ts
+++ b/project/backend/libs/common/src/i18n/messages.ts
@@ -130,7 +130,10 @@ export const messages: Record<ResponseCode, Record<Locale, MessageValue>> = {
'en-US': 'Media group not found',
'zh-CN': '媒体分组未找到',
},
-
+ [ResponseCode.MediaGroupDefaultNotAllowed]: {
+ 'en-US': 'Default media group cannot be deleted',
+ 'zh-CN': '默认媒体组不能删除',
+ },
// 12800 (material)
[ResponseCode.MaterialNotFound]: {
'en-US': 'Material not found',
@@ -144,7 +147,10 @@ export const messages: Record<ResponseCode, Record<Locale, MessageValue>> = {
'en-US': 'Material task not found',
'zh-CN': '素材任务不存在',
},
-
+ [ResponseCode.MaterialGroupDefaultNotAllowed]: {
+ 'en-US': 'Default material group cannot be deleted',
+ 'zh-CN': '默认素材组不能删除',
+ },
// 12900 (content/material)
[ResponseCode.MaterialGroupEmpty]: {
'en-US': 'Material group cannot be empty',