mirror of
https://github.com/SyncrowIOT/backend.git
synced 2025-08-25 21:19:40 +00:00
Compare commits
15 Commits
3f2c36d48b
...
task/add-p
Author | SHA1 | Date | |
---|---|---|---|
4b9127676e | |||
212d0d1974 | |||
6d529ee0ae | |||
85687e7950 | |||
7e2c3136cf | |||
61348aa351 | |||
dea942f11e | |||
d62e620828 | |||
f0556813ac | |||
6d2252a403 | |||
8d265c9105 | |||
a4095c837b | |||
65d4a56135 | |||
fffa27b6ee | |||
12579fcd6e |
64
.github/workflows/pr-description.yml
vendored
Normal file
64
.github/workflows/pr-description.yml
vendored
Normal file
@ -0,0 +1,64 @@
|
||||
name: 🤖 AI PR Description Commenter (100% Safe with jq)
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
types: [opened, edited]
|
||||
|
||||
jobs:
|
||||
generate-description:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout Repo
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Install GitHub CLI and jq
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install gh jq -y
|
||||
|
||||
- name: Fetch PR Commits
|
||||
id: fetch_commits
|
||||
run: |
|
||||
COMMITS=$(gh pr view ${{ github.event.pull_request.number }} --json commits --jq '.commits[].message' | sed 's/^/- /')
|
||||
echo "commits<<EOF" >> $GITHUB_ENV
|
||||
echo "$COMMITS" >> $GITHUB_ENV
|
||||
echo "EOF" >> $GITHUB_ENV
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GH_PERSONAL_TOKEN }}
|
||||
|
||||
- name: Generate PR Description with OpenAI (Safe JSON with jq)
|
||||
run: |
|
||||
REQUEST_BODY=$(jq -n \
|
||||
--arg model "gpt-4o" \
|
||||
--arg content "Given the following commit messages:\n\n${commits}\n\nGenerate a clear and professional pull request description." \
|
||||
'{
|
||||
model: $model,
|
||||
messages: [{ role: "user", content: $content }]
|
||||
}'
|
||||
)
|
||||
|
||||
RESPONSE=$(curl -s https://api.openai.com/v1/chat/completions \
|
||||
-H "Authorization: Bearer $OPENAI_API_KEY" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "$REQUEST_BODY")
|
||||
|
||||
DESCRIPTION=$(echo "$RESPONSE" | jq -r '.choices[0].message.content')
|
||||
|
||||
echo "---------- OpenAI Raw Response ----------"
|
||||
echo "$RESPONSE"
|
||||
echo "---------- Extracted Description ----------"
|
||||
echo "$DESCRIPTION"
|
||||
|
||||
echo "description<<EOF" >> $GITHUB_ENV
|
||||
echo "$DESCRIPTION" >> $GITHUB_ENV
|
||||
echo "EOF" >> $GITHUB_ENV
|
||||
env:
|
||||
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
|
||||
commits: ${{ env.commits }}
|
||||
|
||||
- name: Post AI Generated Description as Comment
|
||||
run: |
|
||||
gh pr comment ${{ github.event.pull_request.number }} --body "${{ env.description }}"
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GH_PERSONAL_TOKEN }}
|
@ -1,24 +1,9 @@
|
||||
import { ApiProperty } from '@nestjs/swagger';
|
||||
import { Transform } from 'class-transformer';
|
||||
import { IsBoolean, IsOptional } from 'class-validator';
|
||||
import { BooleanValues } from '../constants/boolean-values.enum';
|
||||
import { IsOptional } from 'class-validator';
|
||||
import { IsPageRequestParam } from '../validators/is-page-request-param.validator';
|
||||
import { IsSizeRequestParam } from '../validators/is-size-request-param.validator';
|
||||
|
||||
export class PaginationRequestGetListDto {
|
||||
@ApiProperty({
|
||||
example: true,
|
||||
description: 'include spaces',
|
||||
required: false,
|
||||
default: false,
|
||||
})
|
||||
@IsOptional()
|
||||
@IsBoolean()
|
||||
@Transform((value) => {
|
||||
return value.obj.includeSpaces === BooleanValues.TRUE;
|
||||
})
|
||||
public includeSpaces?: boolean = false;
|
||||
|
||||
@IsOptional()
|
||||
@IsPageRequestParam({
|
||||
message: 'Page must be bigger than 0',
|
||||
|
@ -1,15 +1,13 @@
|
||||
import { DeviceStatusLogRepository } from '@app/common/modules/device-status-log/repositories';
|
||||
import { DeviceRepository } from '@app/common/modules/device/repositories';
|
||||
import {
|
||||
HttpException,
|
||||
HttpStatus,
|
||||
Injectable,
|
||||
NotFoundException,
|
||||
} from '@nestjs/common';
|
||||
import { AddDeviceStatusDto } from '../dtos/add.devices-status.dto';
|
||||
import { DeviceRepository } from '@app/common/modules/device/repositories';
|
||||
import { GetDeviceDetailsFunctionsStatusInterface } from 'src/device/interfaces/get.device.interface';
|
||||
import { TuyaContext } from '@tuya/tuya-connector-nodejs';
|
||||
import { ConfigService } from '@nestjs/config';
|
||||
import { firebaseDataBase } from '../../firebase.config';
|
||||
import { TuyaContext } from '@tuya/tuya-connector-nodejs';
|
||||
import {
|
||||
Database,
|
||||
DataSnapshot,
|
||||
@ -17,7 +15,9 @@ import {
|
||||
ref,
|
||||
runTransaction,
|
||||
} from 'firebase/database';
|
||||
import { DeviceStatusLogRepository } from '@app/common/modules/device-status-log/repositories';
|
||||
import { GetDeviceDetailsFunctionsStatusInterface } from 'src/device/interfaces/get.device.interface';
|
||||
import { firebaseDataBase } from '../../firebase.config';
|
||||
import { AddDeviceStatusDto } from '../dtos/add.devices-status.dto';
|
||||
@Injectable()
|
||||
export class DeviceStatusFirebaseService {
|
||||
private tuya: TuyaContext;
|
||||
@ -79,64 +79,77 @@ export class DeviceStatusFirebaseService {
|
||||
device: any;
|
||||
}[],
|
||||
): Promise<void> {
|
||||
const allLogs = [];
|
||||
|
||||
console.log(`🔁 Preparing logs from batch of ${batch.length} items...`);
|
||||
|
||||
const allLogs = [];
|
||||
|
||||
for (const item of batch) {
|
||||
const device = item.device;
|
||||
|
||||
if (!device?.uuid) {
|
||||
console.log(`⛔ Skipped unknown device: ${item.deviceTuyaUuid}`);
|
||||
continue;
|
||||
}
|
||||
|
||||
const logs = item.log.properties.map((property) =>
|
||||
// Determine properties based on environment
|
||||
const properties =
|
||||
this.isDevEnv && Array.isArray(item.log?.properties)
|
||||
? item.log.properties
|
||||
: Array.isArray(item.status)
|
||||
? item.status
|
||||
: null;
|
||||
|
||||
if (!properties) {
|
||||
console.log(
|
||||
`⛔ Skipped invalid status/properties for device: ${item.deviceTuyaUuid}`,
|
||||
);
|
||||
continue;
|
||||
}
|
||||
|
||||
const logs = properties.map((property) =>
|
||||
this.deviceStatusLogRepository.create({
|
||||
deviceId: device.uuid,
|
||||
deviceTuyaId: item.deviceTuyaUuid,
|
||||
productId: item.log.productId,
|
||||
productId: device.productDevice?.uuid,
|
||||
log: item.log,
|
||||
code: property.code,
|
||||
value: property.value,
|
||||
eventId: item.log.dataId,
|
||||
eventTime: new Date(property.time).toISOString(),
|
||||
eventId: item.log?.dataId,
|
||||
eventTime: new Date(
|
||||
this.isDevEnv ? property.time : property.t,
|
||||
).toISOString(),
|
||||
}),
|
||||
);
|
||||
|
||||
allLogs.push(...logs);
|
||||
}
|
||||
|
||||
console.log(`📝 Total logs to insert: ${allLogs.length}`);
|
||||
|
||||
const insertLogsPromise = (async () => {
|
||||
const chunkSize = 300;
|
||||
let insertedCount = 0;
|
||||
const chunkSize = 300;
|
||||
let insertedCount = 0;
|
||||
|
||||
for (let i = 0; i < allLogs.length; i += chunkSize) {
|
||||
const chunk = allLogs.slice(i, i + chunkSize);
|
||||
try {
|
||||
const result = await this.deviceStatusLogRepository
|
||||
.createQueryBuilder()
|
||||
.insert()
|
||||
.into('device-status-log') // or use DeviceStatusLogEntity
|
||||
.values(chunk)
|
||||
.orIgnore() // skip duplicates
|
||||
.execute();
|
||||
for (let i = 0; i < allLogs.length; i += chunkSize) {
|
||||
const chunk = allLogs.slice(i, i + chunkSize);
|
||||
try {
|
||||
const result = await this.deviceStatusLogRepository
|
||||
.createQueryBuilder()
|
||||
.insert()
|
||||
.into('device-status-log')
|
||||
.values(chunk)
|
||||
.orIgnore()
|
||||
.execute();
|
||||
|
||||
insertedCount += result.identifiers.length;
|
||||
console.log(
|
||||
`✅ Inserted ${result.identifiers.length} / ${chunk.length} logs (chunk)`,
|
||||
);
|
||||
} catch (error) {
|
||||
console.error('❌ Insert error (skipped chunk):', error.message);
|
||||
}
|
||||
insertedCount += result.identifiers.length;
|
||||
console.log(
|
||||
`✅ Inserted ${result.identifiers.length} / ${chunk.length} logs (chunk)`,
|
||||
);
|
||||
} catch (error) {
|
||||
console.error('❌ Insert error (skipped chunk):', error.message);
|
||||
}
|
||||
}
|
||||
|
||||
console.log(
|
||||
`✅ Total logs inserted: ${insertedCount} / ${allLogs.length}`,
|
||||
);
|
||||
})();
|
||||
|
||||
await insertLogsPromise;
|
||||
console.log(`✅ Total logs inserted: ${insertedCount} / ${allLogs.length}`);
|
||||
}
|
||||
|
||||
async addDeviceStatusToFirebase(
|
||||
|
@ -1,9 +1,9 @@
|
||||
import { Injectable, OnModuleInit } from '@nestjs/common';
|
||||
import TuyaWebsocket from '../../config/tuya-web-socket-config';
|
||||
import { ConfigService } from '@nestjs/config';
|
||||
import { DeviceStatusFirebaseService } from '@app/common/firebase/devices-status/services/devices-status.service';
|
||||
import { SosHandlerService } from './sos.handler.service';
|
||||
import { Injectable, OnModuleInit } from '@nestjs/common';
|
||||
import { ConfigService } from '@nestjs/config';
|
||||
import * as NodeCache from 'node-cache';
|
||||
import TuyaWebsocket from '../../config/tuya-web-socket-config';
|
||||
import { SosHandlerService } from './sos.handler.service';
|
||||
|
||||
@Injectable()
|
||||
export class TuyaWebSocketService implements OnModuleInit {
|
||||
@ -74,7 +74,12 @@ export class TuyaWebSocketService implements OnModuleInit {
|
||||
this.client.message(async (ws: WebSocket, message: any) => {
|
||||
try {
|
||||
const { devId, status, logData } = this.extractMessageData(message);
|
||||
if (!Array.isArray(logData?.properties)) {
|
||||
// console.log(
|
||||
// `📬 Received message for device: ${devId}, status:`,
|
||||
// status,
|
||||
// logData,
|
||||
// );
|
||||
if (!Array.isArray(status)) {
|
||||
this.client.ackMessage(message.messageId);
|
||||
return;
|
||||
}
|
||||
@ -162,6 +167,8 @@ export class TuyaWebSocketService implements OnModuleInit {
|
||||
status: any;
|
||||
logData: any;
|
||||
} {
|
||||
// console.log('Received message:', message);
|
||||
|
||||
const payloadData = message.payload.data;
|
||||
|
||||
if (this.isDevEnv) {
|
||||
|
@ -1,7 +1,7 @@
|
||||
import { HttpException, HttpStatus, Injectable } from '@nestjs/common';
|
||||
import { ConfigService } from '@nestjs/config';
|
||||
import axios from 'axios';
|
||||
import nodemailer from 'nodemailer';
|
||||
import * as nodemailer from 'nodemailer';
|
||||
import Mail from 'nodemailer/lib/mailer';
|
||||
import { BatchEmailData } from './batch-email.interface';
|
||||
import { SingleEmailData } from './single-email.interface';
|
||||
|
@ -1,13 +1,10 @@
|
||||
import { BooleanValues } from '@app/common/constants/boolean-values.enum';
|
||||
import { PaginationRequestWithSearchGetListDto } from '@app/common/dto/pagination-with-search.request.dto';
|
||||
import { ApiProperty, OmitType } from '@nestjs/swagger';
|
||||
import { ApiProperty } from '@nestjs/swagger';
|
||||
import { Transform } from 'class-transformer';
|
||||
import { IsBoolean, IsNotEmpty, IsOptional } from 'class-validator';
|
||||
|
||||
export class BookableSpaceRequestDto extends OmitType(
|
||||
PaginationRequestWithSearchGetListDto,
|
||||
['includeSpaces'],
|
||||
) {
|
||||
export class BookableSpaceRequestDto extends PaginationRequestWithSearchGetListDto {
|
||||
@ApiProperty({
|
||||
type: Boolean,
|
||||
required: false,
|
||||
|
@ -3,12 +3,12 @@ import { IsNotEmpty, IsOptional, IsUUID, Matches } from 'class-validator';
|
||||
|
||||
export class BookingRequestDto {
|
||||
@ApiProperty({
|
||||
description: 'Month in MM/YYYY format',
|
||||
example: '07/2025',
|
||||
description: 'Month in MM-YYYY format',
|
||||
example: '07-2025',
|
||||
})
|
||||
@IsNotEmpty()
|
||||
@Matches(/^(0[1-9]|1[0-2])\/\d{4}$/, {
|
||||
message: 'Date must be in MM/YYYY format',
|
||||
message: 'Date must be in MM-YYYY format',
|
||||
})
|
||||
month: string;
|
||||
|
||||
|
@ -51,7 +51,7 @@ export class BookingService {
|
||||
}
|
||||
|
||||
async findAll({ month, space }: BookingRequestDto, project: string) {
|
||||
const [monthNumber, year] = month.split('/').map(Number);
|
||||
const [monthNumber, year] = month.split('-').map(Number);
|
||||
const fromDate = new Date(year, monthNumber - 1, 1);
|
||||
const toDate = new Date(year, monthNumber, 0, 23, 59, 59);
|
||||
return this.bookingEntityRepository.find({
|
||||
|
@ -17,10 +17,10 @@ import { CommunityService } from '../services/community.service';
|
||||
// import { CheckUserCommunityGuard } from 'src/guards/user.community.guard';
|
||||
import { ControllerRoute } from '@app/common/constants/controller-route';
|
||||
import { BaseResponseDto } from '@app/common/dto/base.response.dto';
|
||||
import { PaginationRequestWithSearchGetListDto } from '@app/common/dto/pagination-with-search.request.dto';
|
||||
import { Permissions } from 'src/decorators/permissions.decorator';
|
||||
import { PermissionsGuard } from 'src/guards/permissions.guard';
|
||||
import { ProjectParam } from '../dtos';
|
||||
import { CommunityFilterDto } from '../dtos/community-filter.dto';
|
||||
|
||||
@ApiTags('Community Module')
|
||||
@Controller({
|
||||
@ -55,7 +55,7 @@ export class CommunityController {
|
||||
@Get('v2')
|
||||
async getCommunitiesV2(
|
||||
@Param() param: ProjectParam,
|
||||
@Query() query: PaginationRequestWithSearchGetListDto,
|
||||
@Query() query: CommunityFilterDto,
|
||||
): Promise<any> {
|
||||
return this.communityService.getCommunitiesV2(param, query);
|
||||
}
|
||||
@ -85,7 +85,7 @@ export class CommunityController {
|
||||
@Get()
|
||||
async getCommunities(
|
||||
@Param() param: ProjectParam,
|
||||
@Query() query: PaginationRequestWithSearchGetListDto,
|
||||
@Query() query: CommunityFilterDto,
|
||||
): Promise<BaseResponseDto> {
|
||||
return this.communityService.getCommunities(param, query);
|
||||
}
|
||||
|
20
src/community/dtos/community-filter.dto.ts
Normal file
20
src/community/dtos/community-filter.dto.ts
Normal file
@ -0,0 +1,20 @@
|
||||
import { BooleanValues } from '@app/common/constants/boolean-values.enum';
|
||||
import { PaginationRequestWithSearchGetListDto } from '@app/common/dto/pagination-with-search.request.dto';
|
||||
import { ApiProperty } from '@nestjs/swagger';
|
||||
import { Transform } from 'class-transformer';
|
||||
import { IsBoolean, IsOptional } from 'class-validator';
|
||||
|
||||
export class CommunityFilterDto extends PaginationRequestWithSearchGetListDto {
|
||||
@ApiProperty({
|
||||
example: true,
|
||||
description: 'include spaces',
|
||||
required: false,
|
||||
default: false,
|
||||
})
|
||||
@IsOptional()
|
||||
@IsBoolean()
|
||||
@Transform((value) => {
|
||||
return value.obj.includeSpaces === BooleanValues.TRUE;
|
||||
})
|
||||
public includeSpaces?: boolean = false;
|
||||
}
|
@ -1,4 +1,5 @@
|
||||
import { DeviceTypeEnum } from '@app/common/constants/device-type.enum';
|
||||
import { PaginationRequestGetListDto } from '@app/common/dto/pagination.request.dto';
|
||||
import { ApiProperty } from '@nestjs/swagger';
|
||||
import { Transform } from 'class-transformer';
|
||||
import {
|
||||
@ -65,7 +66,7 @@ export class GetDevicesBySpaceOrCommunityDto {
|
||||
requireEither?: never; // This ensures at least one of them is provided
|
||||
}
|
||||
|
||||
export class GetDevicesFilterDto {
|
||||
export class GetDevicesFilterDto extends PaginationRequestGetListDto {
|
||||
@ApiProperty({
|
||||
description: 'Device Type',
|
||||
enum: DeviceTypeEnum,
|
||||
|
@ -7,6 +7,7 @@ import { CommonErrorCodes } from '@app/common/constants/error-codes.enum';
|
||||
import { ProductType } from '@app/common/constants/product-type.enum';
|
||||
import { SceneSwitchesTypeEnum } from '@app/common/constants/scene-switch-type.enum';
|
||||
import { BaseResponseDto } from '@app/common/dto/base.response.dto';
|
||||
import { PageResponse } from '@app/common/dto/pagination.response.dto';
|
||||
import { SuccessResponseDto } from '@app/common/dto/success.response.dto';
|
||||
import { DeviceStatusFirebaseService } from '@app/common/firebase/devices-status/services/devices-status.service';
|
||||
import { convertKeysToCamelCase } from '@app/common/helper/camelCaseConverter';
|
||||
@ -20,6 +21,7 @@ import { SceneDeviceRepository } from '@app/common/modules/scene-device/reposito
|
||||
import { SpaceEntity } from '@app/common/modules/space/entities/space.entity';
|
||||
import { SpaceRepository } from '@app/common/modules/space/repositories';
|
||||
import { addSpaceUuidToDevices } from '@app/common/util/device-utils';
|
||||
import { getPaginationResponseDto } from '@app/common/util/getPaginationResponseDto';
|
||||
import {
|
||||
BadRequestException,
|
||||
forwardRef,
|
||||
@ -100,7 +102,7 @@ export class DeviceService {
|
||||
|
||||
async getAllDevices(
|
||||
param: ProjectParam,
|
||||
{ deviceType, spaces, communities }: GetDevicesFilterDto,
|
||||
{ deviceType, spaces, communities, page, size }: GetDevicesFilterDto,
|
||||
): Promise<BaseResponseDto> {
|
||||
try {
|
||||
await this.validateProject(param.projectUuid);
|
||||
@ -108,9 +110,12 @@ export class DeviceService {
|
||||
return await this.getDoorLockDevices(param.projectUuid, {
|
||||
spaces,
|
||||
communities,
|
||||
deviceType,
|
||||
page,
|
||||
size,
|
||||
});
|
||||
} else if (!deviceType) {
|
||||
const devices = await this.deviceRepository.find({
|
||||
const [devices, count] = await this.deviceRepository.findAndCount({
|
||||
where: {
|
||||
isActive: true,
|
||||
spaceDevice: {
|
||||
@ -133,6 +138,8 @@ export class DeviceService {
|
||||
'permission.permissionType',
|
||||
'subspace',
|
||||
],
|
||||
take: size ?? 10,
|
||||
skip: (page ? page - 1 : 0) * (size ?? 10),
|
||||
});
|
||||
|
||||
const devicesData = await Promise.allSettled(
|
||||
@ -234,11 +241,14 @@ export class DeviceService {
|
||||
.value,
|
||||
);
|
||||
|
||||
return new SuccessResponseDto({
|
||||
message: `Devices fetched successfully`,
|
||||
data: fulfilledDevices,
|
||||
statusCode: HttpStatus.OK,
|
||||
});
|
||||
return new PageResponse(
|
||||
{
|
||||
message: `Devices fetched successfully`,
|
||||
data: fulfilledDevices,
|
||||
statusCode: HttpStatus.OK,
|
||||
},
|
||||
getPaginationResponseDto(count, page ?? 1, size ?? 10),
|
||||
);
|
||||
}
|
||||
} catch (error) {
|
||||
if (error instanceof HttpException) {
|
||||
@ -1301,11 +1311,11 @@ export class DeviceService {
|
||||
|
||||
private async getDoorLockDevices(
|
||||
projectUuid: string,
|
||||
{ communities, spaces }: { spaces?: string[]; communities?: string[] },
|
||||
{ communities, spaces, page, size }: GetDevicesFilterDto,
|
||||
) {
|
||||
await this.validateProject(projectUuid);
|
||||
|
||||
const devices = await this.deviceRepository.find({
|
||||
const [devices, count] = await this.deviceRepository.findAndCount({
|
||||
where: {
|
||||
productDevice: {
|
||||
prodType: ProductType.DL,
|
||||
@ -1324,6 +1334,8 @@ export class DeviceService {
|
||||
isActive: true,
|
||||
},
|
||||
relations: ['productDevice', 'spaceDevice'],
|
||||
take: size ?? 10,
|
||||
skip: (page ? page - 1 : 0) * (size ?? 10),
|
||||
});
|
||||
|
||||
const devicesData = await Promise.all(
|
||||
@ -1355,11 +1367,14 @@ export class DeviceService {
|
||||
(deviceData) => deviceData !== null,
|
||||
);
|
||||
|
||||
return new SuccessResponseDto({
|
||||
message: 'Successfully retrieved all pass devices',
|
||||
data: filteredDevicesData,
|
||||
statusCode: HttpStatus.OK,
|
||||
});
|
||||
return new PageResponse(
|
||||
{
|
||||
message: 'Successfully retrieved all pass devices',
|
||||
data: filteredDevicesData,
|
||||
statusCode: HttpStatus.OK,
|
||||
},
|
||||
getPaginationResponseDto(count, page ?? 1, size ?? 10),
|
||||
);
|
||||
}
|
||||
|
||||
private async controlDeviceTuya(
|
||||
|
@ -1,7 +1,3 @@
|
||||
import { PaginationRequestGetListDto } from '@app/common/dto/pagination.request.dto';
|
||||
import { PickType } from '@nestjs/swagger';
|
||||
|
||||
export class ListProjectsDto extends PickType(PaginationRequestGetListDto, [
|
||||
'page',
|
||||
'size',
|
||||
]) {}
|
||||
export class ListProjectsDto extends PaginationRequestGetListDto {}
|
||||
|
@ -1,4 +1,5 @@
|
||||
import { ControllerRoute } from '@app/common/constants/controller-route';
|
||||
import { BaseResponseDto } from '@app/common/dto/base.response.dto';
|
||||
import {
|
||||
Body,
|
||||
Controller,
|
||||
@ -11,18 +12,17 @@ import {
|
||||
UseGuards,
|
||||
} from '@nestjs/common';
|
||||
import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
|
||||
import { SpaceModelService } from '../services';
|
||||
import { ProjectParam } from 'src/community/dtos';
|
||||
import { Permissions } from 'src/decorators/permissions.decorator';
|
||||
import { PermissionsGuard } from 'src/guards/permissions.guard';
|
||||
import {
|
||||
CreateSpaceModelDto,
|
||||
LinkSpacesToModelDto,
|
||||
SpaceModelParam,
|
||||
UpdateSpaceModelDto,
|
||||
} from '../dtos';
|
||||
import { ProjectParam } from 'src/community/dtos';
|
||||
import { BaseResponseDto } from '@app/common/dto/base.response.dto';
|
||||
import { PermissionsGuard } from 'src/guards/permissions.guard';
|
||||
import { Permissions } from 'src/decorators/permissions.decorator';
|
||||
import { PaginationRequestGetListDto } from '@app/common/dto/pagination.request.dto';
|
||||
import { SpaceModelFilterDto } from '../dtos/space-model-filter.dto';
|
||||
import { SpaceModelService } from '../services';
|
||||
|
||||
@ApiTags('Space Model Module')
|
||||
@Controller({
|
||||
@ -62,7 +62,7 @@ export class SpaceModelController {
|
||||
@Get()
|
||||
async listSpaceModel(
|
||||
@Param() projectParam: ProjectParam,
|
||||
@Query() query: PaginationRequestGetListDto,
|
||||
@Query() query: SpaceModelFilterDto,
|
||||
): Promise<BaseResponseDto> {
|
||||
return await this.spaceModelService.list(projectParam, query);
|
||||
}
|
||||
|
20
src/space-model/dtos/space-model-filter.dto.ts
Normal file
20
src/space-model/dtos/space-model-filter.dto.ts
Normal file
@ -0,0 +1,20 @@
|
||||
import { BooleanValues } from '@app/common/constants/boolean-values.enum';
|
||||
import { PaginationRequestGetListDto } from '@app/common/dto/pagination.request.dto';
|
||||
import { ApiProperty } from '@nestjs/swagger';
|
||||
import { Transform } from 'class-transformer';
|
||||
import { IsBoolean, IsOptional } from 'class-validator';
|
||||
|
||||
export class SpaceModelFilterDto extends PaginationRequestGetListDto {
|
||||
@ApiProperty({
|
||||
example: true,
|
||||
description: 'include spaces',
|
||||
required: false,
|
||||
default: false,
|
||||
})
|
||||
@IsOptional()
|
||||
@IsBoolean()
|
||||
@Transform((value) => {
|
||||
return value.obj.includeSpaces === BooleanValues.TRUE;
|
||||
})
|
||||
public includeSpaces?: boolean = false;
|
||||
}
|
@ -1,4 +1,5 @@
|
||||
import { ControllerRoute } from '@app/common/constants/controller-route';
|
||||
import { BaseResponseDto } from '@app/common/dto/base.response.dto';
|
||||
import {
|
||||
Body,
|
||||
Controller,
|
||||
@ -10,13 +11,12 @@ import {
|
||||
Query,
|
||||
UseGuards,
|
||||
} from '@nestjs/common';
|
||||
import { SubSpaceService } from '../../services';
|
||||
import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
|
||||
import { AddSubspaceDto, GetSpaceParam, GetSubSpaceParam } from '../../dtos';
|
||||
import { BaseResponseDto } from '@app/common/dto/base.response.dto';
|
||||
import { PaginationRequestGetListDto } from '@app/common/dto/pagination.request.dto';
|
||||
import { PermissionsGuard } from 'src/guards/permissions.guard';
|
||||
import { Permissions } from 'src/decorators/permissions.decorator';
|
||||
import { PermissionsGuard } from 'src/guards/permissions.guard';
|
||||
import { SubspaceFilterDto } from 'src/space/dtos/subspace-filter.dto';
|
||||
import { AddSubspaceDto, GetSpaceParam, GetSubSpaceParam } from '../../dtos';
|
||||
import { SubSpaceService } from '../../services';
|
||||
|
||||
@ApiTags('Space Module')
|
||||
@Controller({
|
||||
@ -51,7 +51,7 @@ export class SubSpaceController {
|
||||
@Get()
|
||||
async list(
|
||||
@Param() params: GetSpaceParam,
|
||||
@Query() query: PaginationRequestGetListDto,
|
||||
@Query() query: SubspaceFilterDto,
|
||||
): Promise<BaseResponseDto> {
|
||||
return this.subSpaceService.list(params, query);
|
||||
}
|
||||
|
20
src/space/dtos/subspace-filter.dto.ts
Normal file
20
src/space/dtos/subspace-filter.dto.ts
Normal file
@ -0,0 +1,20 @@
|
||||
import { BooleanValues } from '@app/common/constants/boolean-values.enum';
|
||||
import { PaginationRequestGetListDto } from '@app/common/dto/pagination.request.dto';
|
||||
import { ApiProperty } from '@nestjs/swagger';
|
||||
import { Transform } from 'class-transformer';
|
||||
import { IsBoolean, IsOptional } from 'class-validator';
|
||||
|
||||
export class SubspaceFilterDto extends PaginationRequestGetListDto {
|
||||
@ApiProperty({
|
||||
example: true,
|
||||
description: 'include spaces',
|
||||
required: false,
|
||||
default: false,
|
||||
})
|
||||
@IsOptional()
|
||||
@IsBoolean()
|
||||
@Transform((value) => {
|
||||
return value.obj.includeSpaces === BooleanValues.TRUE;
|
||||
})
|
||||
public includeSpaces?: boolean = false;
|
||||
}
|
Reference in New Issue
Block a user