Просмотр исходного кода

chore: Add del column to PhoneList and Task entities

x1ongzhu 1 год назад
Родитель
Сommit
267335e1d3

+ 3 - 0
src/phone-list/entities/phone-list.entity.ts

@@ -23,4 +23,7 @@ export class PhoneList {
 
     @Exclude()
     userName: string
+
+    @Column({ default: false })
+    del: boolean
 }

+ 2 - 1
src/phone-list/entities/phone.entity.ts

@@ -1,4 +1,4 @@
-import { Column, CreateDateColumn, Entity, PrimaryGeneratedColumn } from 'typeorm'
+import { Column, CreateDateColumn, Entity, Index, PrimaryGeneratedColumn } from 'typeorm'
 
 @Entity()
 export class Phone {
@@ -12,5 +12,6 @@ export class Phone {
     number: string
 
     @Column({ nullable: false })
+    @Index()
     listId: number
 }

+ 3 - 1
src/phone-list/phone-list.controller.ts

@@ -32,6 +32,7 @@ export class PhoneListController {
     @Put('/')
     async createPhoneList(@Req() req, @Body() body) {
         body.userId = req.user.id
+        body.del = false
         return await this.phoneListService.createPhoneList(req.body)
     }
 
@@ -63,7 +64,8 @@ export class PhoneListController {
             .toString()
             .replaceAll('\r\n', '\n')
             .split('\n')
-            .filter((phone) => phone.length > 0)
+            .map((phone) => phone.trim().replaceAll(' ', ''))
+            .filter((phone) => phone.length > 0 && /^\+?\d+$/.test(phone))
         await this.phoneListService.importList(parseInt(id), phones)
     }
 

+ 3 - 3
src/phone-list/phone-list.service.ts

@@ -24,13 +24,13 @@ export class PhoneListService {
         const page = await paginate<PhoneList>(this.phoneListRepository, req.page, req.search)
         if (page.items.length !== 0) {
             let items = page.items
-            const userIds = items.map(item => item.userId)
+            const userIds = items.map((item) => item.userId)
             const users = await this.userRepository.findBy({
                 id: In(userIds)
             })
             for (let i = 0; i < items.length; i++) {
                 const item = items[i]
-                const user = users.find(user => user.id === item.userId)
+                const user = users.find((user) => user.id === item.userId)
                 if (user) {
                     item.userName = user.username
                 }
@@ -73,7 +73,7 @@ export class PhoneListService {
     }
 
     async delPhoneList(id: number): Promise<void> {
-        await this.phoneListRepository.delete(id)
+        await this.phoneListRepository.update(id, { del: true })
     }
 
     async delPhone(id: number): Promise<void> {

+ 3 - 0
src/task/entities/task.entity.ts

@@ -78,4 +78,7 @@ export class Task {
 
     @Exclude()
     userName: string
+
+    @Column({ default: false })
+    del: boolean
 }