Merge pull request #31 from Bricks666/develop

v2.4.2
Bricks666 · Mar 26, 2024 · 80fa966 · 80fa966
2 parents c013639 + d321d84
commit 80fa966
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "server",
-	"version": "2.4.1",
+	"version": "2.4.2",
 	"description": "",
 	"main": "./dist/index.js",
 	"scripts": {

diff --git a/src/activities/dto/activities-filters.dto.ts b/src/activities/dto/activities-filters.dto.ts
@@ -12,7 +12,7 @@ export class ActivitiesFiltersDto {
 	})
 	@IsNumber({}, { each: true, })
 	@IsOptional()
-	@NumberTransform()
+	@NumberTransform({ singleValueAsArray: true, })
 	declare activistIds?: number[];
 
 	@ApiProperty({
@@ -24,7 +24,7 @@ export class ActivitiesFiltersDto {
 	})
 	@IsNumber({}, { each: true, })
 	@IsOptional()
-	@NumberTransform()
+	@NumberTransform({ singleValueAsArray: true, })
 	declare sphereIds?: number[];
 
 	@ApiProperty({
@@ -36,7 +36,7 @@ export class ActivitiesFiltersDto {
 	})
 	@IsNumber({}, { each: true, })
 	@IsOptional()
-	@NumberTransform()
+	@NumberTransform({ singleValueAsArray: true, })
 	declare actionIds?: number[];
 
 	@ApiProperty({

diff --git a/src/shared/lib/number-transform.decorator.ts b/src/shared/lib/number-transform.decorator.ts
@@ -1,6 +1,13 @@
 import { Transform } from 'class-transformer';
 
-export const NumberTransform = (defaultValue?: number[] | number) => {
+export interface NumberTransformParams {
+	readonly defaultValue?: number | number[];
+	readonly singleValueAsArray?: boolean;
+}
+
+export const NumberTransform = (params: NumberTransformParams = {}) => {
+	const { defaultValue, singleValueAsArray = false, } = params;
+
 	return Transform((property) => {
 		const { value, } = property;
 
@@ -18,7 +25,10 @@ export const NumberTransform = (defaultValue?: number[] | number) => {
 
 		const numbers = value.split(',');
 
-		if (numbers.length > 1) {
+		const multipleValues = numbers.length > 1;
+		const singleArrayedValue = numbers.length === 1 && singleValueAsArray;
+
+		if (multipleValues || singleArrayedValue) {
 			return numbers.map(Number);
 		}
 

diff --git a/src/tasks/dto/tasks-filters.dto.ts b/src/tasks/dto/tasks-filters.dto.ts
@@ -12,7 +12,7 @@ export class TasksFiltersDto {
 	})
 	@IsNumber({}, { each: true, })
 	@IsOptional()
-	@NumberTransform()
+	@NumberTransform({ singleValueAsArray: true, })
 	declare readonly authorIds?: number[];
 
 	@ApiProperty({
@@ -24,7 +24,7 @@ export class TasksFiltersDto {
 	})
 	@IsNumber({}, { each: true, })
 	@IsOptional()
-	@NumberTransform()
+	@NumberTransform({ singleValueAsArray: true, })
 	declare readonly tagIds?: number[];
 
 	@ApiProperty({