Skip to content

Commit 7780da0

Browse files
committed
Merge branch '1-schematics' of https://github.com/Libertech-FR/teaket into 1-schematics
2 parents 0d07947 + 3539022 commit 7780da0

24 files changed

+939
-12
lines changed

service/src/core/core.module.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ import { AuthModule } from './auth/auth.module'
66
import { UsersModule } from './users/users.module'
77
import { CategoriesModule } from './categories/categories.module'
88
import { ProjectModule } from './projects/project.module'
9-
import { TriggersModule } from './triggers/triggers.module';
10-
import { CrontabsModule } from './crontabs/crontabs.module';
9+
import { TriggersModule } from './triggers/triggers.module'
10+
import { CrontabsModule } from './crontabs/crontabs.module'
11+
import { PreferencesModule } from './preferences/preferences.module'
12+
import { FilestorageModule } from './filestorage/filestorage.module'
1113

1214
@Module({
13-
imports: [AuthModule, UsersModule, CategoriesModule, ProjectModule, TriggersModule, CrontabsModule],
15+
imports: [AuthModule, UsersModule, CategoriesModule, ProjectModule, TriggersModule, CrontabsModule, PreferencesModule, FilestorageModule],
1416
providers: [CoreService],
1517
controllers: [CoreController],
1618
})
File renamed without changes.

service/src/core/crontabs/schemas/crontabs.schema.ts renamed to service/src/core/crontabs/_schemas/crontabs.schema.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ import { AbstractSchema } from '~/_common/abstracts/schemas/abstract.schema'
44

55
export type CrontabsDocument = Crontabs & Document
66

7-
@Schema({ versionKey: false })
7+
@Schema({
8+
collection: 'crontabs',
9+
versionKey: false,
10+
})
811
export class Crontabs extends AbstractSchema {
912
@Prop({
1013
required: true,

service/src/core/crontabs/crontabs.controller.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import { DeleteResult } from 'mongodb'
22
import { Test, TestingModule } from '@nestjs/testing'
33
import { CrontabsController } from './crontabs.controller'
44
import { CrontabsService } from './crontabs.service'
5-
import { CrontabsDto } from './dto/crontabs.dto'
6-
import { Crontabs } from './schemas/crontabs.schema'
5+
import { CrontabsDto } from './_dto/crontabs.dto'
6+
import { Crontabs } from './_schemas/crontabs.schema'
77
import { HttpException, HttpStatus } from '@nestjs/common'
88
import { Types } from 'mongoose'
99
import { Response, Request } from 'express'

service/src/core/crontabs/crontabs.controller.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import { Body, Controller, Delete, Get, HttpStatus, Param, Patch, Post, Req, Res } from '@nestjs/common'
2-
import { CrontabsCreateDto, CrontabsUpdateDto } from './dto/crontabs.dto'
2+
import { CrontabsCreateDto, CrontabsUpdateDto } from './_dto/crontabs.dto'
33
import { CrontabsService } from './crontabs.service'
44
import { AbstractController } from '~/_common/abstracts/abstract.controller'
55
import { ApiParam } from '@nestjs/swagger'
66
import { SearchFilterSchema, FilterSchema, SearchFilterOptions, FilterOptions, ObjectIdValidationPipe } from '@streamkits/nestjs_module_scrud'
77
import { Types } from 'mongoose'
88
import { Request, Response } from 'express'
9+
910
@Controller('crontabs')
1011
export class CrontabsController extends AbstractController {
1112
protected readonly projection = {

service/src/core/crontabs/crontabs.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Module } from '@nestjs/common'
22
import { MongooseModule } from '@nestjs/mongoose'
3-
import { CrontabsSchema, Crontabs } from './schemas/crontabs.schema'
3+
import { CrontabsSchema, Crontabs } from './_schemas/crontabs.schema'
44
import { CrontabsService } from './crontabs.service'
55
import { CrontabsController } from './crontabs.controller'
66

service/src/core/crontabs/crontabs.service.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { DeleteResult } from 'mongodb'
22
import { Test, TestingModule } from '@nestjs/testing'
33
import { CrontabsService } from './crontabs.service'
44
import { getModelToken } from '@nestjs/mongoose'
5-
import { Crontabs } from './schemas/crontabs.schema'
5+
import { Crontabs } from './_schemas/crontabs.schema'
66
import { Model, Types } from 'mongoose'
77

88
describe('CrontabsService', () => {

service/src/core/crontabs/crontabs.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Injectable } from '@nestjs/common'
22
import { InjectModel } from '@nestjs/mongoose'
3-
import { Crontabs } from './schemas/crontabs.schema'
3+
import { Crontabs } from './_schemas/crontabs.schema'
44
import { Model } from 'mongoose'
55
import { AbstractServiceSchema } from '~/_common/abstracts/abstract.service.schema'
66

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { PartialType } from "@nestjs/swagger"
2+
3+
export class FilestorageCreateDto {
4+
5+
}
6+
7+
export class FilestorageUpdateDto extends PartialType(FilestorageCreateDto) {}
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose'
2+
import { Document } from 'mongoose'
3+
import { AbstractSchema } from '~/_common/abstracts/schemas/abstract.schema'
4+
5+
export type FilestorageDocument = Filestorage & Document
6+
7+
@Schema({
8+
collection: 'filestorage',
9+
versionKey: false,
10+
})
11+
export class Filestorage extends AbstractSchema {
12+
@Prop({
13+
required: true,
14+
type: Number,
15+
})
16+
public type: number
17+
18+
@Prop({
19+
required: true,
20+
type: String,
21+
})
22+
public namespace: string
23+
24+
@Prop({
25+
required: true,
26+
type: String,
27+
})
28+
public path: string
29+
30+
@Prop({
31+
required: false,
32+
type: String,
33+
})
34+
public comments?: string
35+
36+
@Prop({
37+
required: true,
38+
type: Boolean,
39+
})
40+
public hidden: boolean
41+
42+
@Prop({
43+
required: false,
44+
type: Object,
45+
})
46+
public tags?: { [key: string]: any }
47+
48+
@Prop({
49+
required: false,
50+
type: Object,
51+
})
52+
public acls?: { [key: string]: any }
53+
54+
@Prop({
55+
required: false,
56+
type: Object,
57+
})
58+
public customFields?: { [key: string]: any }
59+
}
60+
61+
export const FilestorageSchema = SchemaFactory.createForClass(Filestorage)

0 commit comments

Comments
 (0)