chore: remove isdraft field

bs32g1038 · Jul 27, 2023 · 2d83369 · 2d83369
1 parent 16e13c5
commit 2d83369
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/server/models/article.model.ts b/server/models/article.model.ts
@@ -31,7 +31,6 @@ export const ArticleJoiSchema = {
         post: (schema) => schema.required(),
     }),
     tags: Joi.array().items(Joi.string().max(20)),
-    isDraft: Joi.boolean().optional(),
 };
 
 export type ArticleDocument = Article & Document;
@@ -78,9 +77,6 @@ export class Article {
     @Prop({ default: false, select: false })
     isDeleted: boolean;
 
-    @Prop({ default: false })
-    isDraft: boolean;
-
     @Prop([DayReadings])
     dayReadings: DayReadings[];
 }

diff --git a/server/modules/article/article.controller.ts b/server/modules/article/article.controller.ts
@@ -5,7 +5,6 @@ import { Roles } from '../../decorators/roles.decorator';
 import { JoiQuery, JoiParam, JoiBody } from '../../decorators/joi.decorator';
 import { RolesGuard } from '../../guards/roles.guard';
 import Joi, { ObjectIdSchema, StandardPaginationSchema, generateObjectIdsSchema } from '../../joi';
-import { auth } from '@blog/server/utils/auth.util';
 import { Request } from 'express';
 @Controller('/api')
 @UseGuards(RolesGuard)
@@ -31,7 +30,6 @@ export class ArticleController {
             cid: Joi.objectId(),
             tag: Joi.string().max(20),
             title: Joi.string().trim().max(80),
-            isDraft: Joi.boolean(),
             ...StandardPaginationSchema,
         })
         query: {
@@ -40,12 +38,8 @@ export class ArticleController {
             cid: string;
             tag: string;
             title: string;
-            isDraft: boolean;
         }
     ) {
-        if (!auth(req)) {
-            query.isDraft = false;
-        }
         const { items, totalCount } = await this.articleService.getArticleList(query);
         return {
             items,

diff --git a/server/modules/article/article.service.ts b/server/modules/article/article.service.ts
@@ -49,7 +49,7 @@ export class ArticleService {
             runValidators: true,
         });
         if (isEmpty(article)) {
-            if (this.draftModel.findById(_id)) {
+            if (await this.draftModel.findById(_id)) {
                 return await this.create({ _id, ...data });
             }
             throw new BadRequestException('找不到该文章！');
@@ -75,7 +75,6 @@ export class ArticleService {
         limit?: number;
         sort?: object;
         title?: string;
-        isDraft?: boolean;
     }) {
         const { page = 1, limit = 10, sort = { createdAt: -1 } } = options;
         const q = new QueryRules(options, {
@@ -86,7 +85,6 @@ export class ArticleService {
         const query = {
             isDeleted: false,
             ...q,
-            ...(options.isDraft === false ? { isDraft: options.isDraft } : {}),
         };
         const { items, totalCount } = await this.articleModel.paginate(query, '', {
             page,