drop fields if using include merging all fields as include filtering bug fix for fields

Author: shivanshtalwar0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@januscaler/tsed-helper",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "type": "module",
   "publishConfig": {
     "@januscaler:registry": "https://npm.pkg.github.com"

src/baseCrud.ts

@@ -89,14 +89,15 @@ export class SearchParams {
 	include?: any;
 }
 
-class GetItemsResponse<T> {
-	@Property()
-	items: T[];
-	@Property()
-	total: number;
-}
+
 export function getItems(options: GetItems): Function {
 	const { path, model, summary } = options;
+	class GetItemsResponse<T> {
+		@CollectionOf(model)
+		items: T[];
+		@Property()
+		total: number;
+	}
 	return useDecorators(
 		Post(path ?? '/search'),
 		Summary(summary ? summary(options) : `Get all ${nameWithoutModel(model)}`),

src/baseService.ts

@@ -226,19 +226,23 @@ export class BaseService<T> implements OnInit, IBaseService {
 		const properties = {
 			skip: offset,
 			take: limit,
-			include: include,
+			include: {
+				...include,
+				..._.transform(_.remove(fields, 'id'), (result, field) => {
+					result[field] = true;
+				}, {})
+			},
 			orderBy: orderBy,
 			where: this.modeToFilter(filters),
 			select: _.isNil(fields)
 				? null
-				: _.transform(
-					fields,
-					(result, field) => {
-						result[field] = true;
-					},
-					{}
-				)
+				: _.transform(fields, (result, field) => {
+					result[field] = true;
+				}, {})
 		};
+		if (_.size(properties.include)) {
+			delete properties.select;
+		}
 
 		const { _count: { id: total } } = await this.injectedRepository.aggregate({
 			where: this.modeToFilter(filters),