Minor code cleanup.

src/core/domain/dtos/es-hit.dto.ts

@@ -1,5 +1,5 @@
 import { ApiProperty } from "@nestjs/swagger";
-import { IsArray, IsDefined, IsIn, IsInt, IsNotEmpty, IsOptional, IsString } from "class-validator";
+import { IsNotEmpty, IsOptional } from "class-validator";
 import { PaperDto } from "./paper.dto";
 
 /**

src/core/domain/dtos/index.ts

@@ -1,3 +1,8 @@
-export * from './es-response.dto'
-export * from './page.dto'
-export * from './search-q.dto'
+export * from './es-query.dto';
+export * from './es-response.dto';
+export * from './es-hit.dto';
+export * from './page.dto';
+export * from './search-q.dto';
+export * from './search-result.dto';
+export * from './paper.dto';
+export * from './request.dto';

src/core/domain/dtos/paper.dto.ts

@@ -1,7 +1,5 @@
 import { ApiProperty } from "@nestjs/swagger";
 import { IsArray, IsDefined, IsIn, IsInt, IsNotEmpty, IsOptional, IsString } from "class-validator";
-import { EsQueryDto } from "./es-query.dto";
-import { SearchQueryDto } from "./search-q.dto";
 
 /**
  * List of allowed properties in this DTO

src/core/domain/dtos/request.dto.ts

@@ -1,5 +1,5 @@
 import { ApiProperty } from "@nestjs/swagger";
-import { IsDefined, IsIn, IsInt, IsNotEmpty, IsOptional, IsString } from "class-validator";
+import { IsDefined, IsNotEmpty, IsOptional } from "class-validator";
 import { EsQueryDto } from "./es-query.dto";
 import { SearchQueryDto } from "./search-q.dto";
 

src/core/domain/dtos/search-q.dto.ts

@@ -1,5 +1,5 @@
 import { ApiProperty } from "@nestjs/swagger";
-import { IsDefined, IsIn, IsInt, IsNotEmpty, IsOptional, IsString } from "class-validator";
+import { IsDefined, IsInt, IsNotEmpty, IsOptional, IsString } from "class-validator";
 
 /**
  * List of allowed properties in this DTO

src/core/domain/dtos/search-result.dto.ts

@@ -1,5 +1,5 @@
 import { ApiProperty } from "@nestjs/swagger";
-import { IsArray, IsDefined, IsInt, IsNotEmpty, IsOptional, IsString } from "class-validator";
+import { IsArray, IsDefined, IsInt, IsNotEmpty } from "class-validator";
 import { EsResponseDto } from "./es-response.dto";
 
 /**

src/core/domain/enums/es-time.enum.ts

@@ -2,11 +2,38 @@
  * Elasticsearch time-units
  */
 export enum EsTime {
+    /**
+     * Days
+     */
     days = 'd',
+
+    /**
+     * Hours
+     */
     hours = 'h',
+
+    /**
+     * Minutes
+     */
     min = 'm',
+
+    /**
+     * Seconds
+     */
     sec = 's',
+
+    /**
+     * Milliseconds
+     */
     ms = 'ms',
+
+    /**
+     * Microseconds
+     */
     us = 'micros',
+    
+    /**
+     * Nanoseconds
+     */
     ns = 'nanos'
 }

src/core/domain/enums/index.ts

@@ -1,3 +1,4 @@
 export * from './httpResponse'
 export * from './roles.enum'
-export * from './page-order.enum'
+export * from './page-order.enum'
+export * from './es-time.enum'

src/core/domain/enums/page-order.enum.ts

@@ -2,6 +2,13 @@
  * Page display order
  */
 export enum Order {
+    /**
+     * Ascending order
+     */
     ASC = 'asc',
+    
+    /**
+     * Descending order
+     */
     DESC = 'desc',
 }

src/core/domain/index.ts

@@ -1 +1,3 @@
-export * from './enums'
+export * from './enums'
+export * from './dtos'
+export * from './interfaces'

src/core/domain/interfaces/es-query-string.interface.ts

@@ -18,9 +18,4 @@
      * Can't be specified with 'default_field'
      */
     fields?: string[];
-
-    /**
-     * 
-     */
-
 }

src/core/domain/interfaces/index.ts

@@ -1,4 +1,7 @@
-export * from './http-response.interface';
+export * from './http-response.interface'
 export * from './page-meta.interface'
 export * from './es-query.interface'
-export * from './es-query-string.interface'
+export * from './es-query-string.interface'
+export * from './es-response-hits.interface'
+export * from './es-pit.interface'
+export * from './search-info.interface'

src/core/interceptors/page.interceptor.ts

@@ -100,7 +100,9 @@ export class PageInterceptor implements NestInterceptor {
                 request.es_query.size += limit - 1;
                 reverse = true;
             } else if (query.page == this.prevSearch.prevPage) {
-                //...
+                // Caching should be HERE
+                request.es_query.sort = [{ _score: { order: 'asc' } }];
+                reverse = true;
             }
         } else {
             this.prevSearch.pit = request.es_query.pit = await this.getPIT(1);

src/core/services/common/search.service.ts

@@ -4,8 +4,6 @@ import { map, take } from "rxjs";
 import { EsResponseDto } from "src/core/domain/dtos";
 import { EsQueryDto } from "src/core/domain/dtos/es-query.dto";
 import { SearchResultDto } from "src/core/domain/dtos/search-result.dto";
-import { EsTime } from "src/core/domain/enums/es-time.enum";
-import { EsPit } from "src/core/domain/interfaces/es-pit.interface";
 
 /**
  * Search service provider
@@ -87,40 +85,4 @@ export class SearchService {
             }
         });
     }
-}
-
-// let ESQ: EsQueryDto = new EsQueryDto;
-
-        // if (limit) ESQ.size = limit;
-        // ESQ.query = {
-        //     query_string: {
-        //         query: query_str,
-        //         default_field: 'content',
-        //     }
-        // }
-        // this.getPIT(1).then((pit) => {
-        //     ESQ.pit = pit;
-        // });
-
-/**
- * Context
- *      // let es_query = { // DTO
-        //     query: { // Interface
-        //         query_string: { // Interface
-        //             query: query_str,
-        //             default_field: "content"
-        //         }
-        //     },
-        // }
- */
-
-/**
- * Single
- *      // let es_query = {
-        //     query: {
-        //         query_string: {
-        //             query: 'id:' + uuid
-        //         }
-        //     },
-        // }
- */
+}

src/infrastructure/config/env.validation.ts

@@ -1,5 +1,5 @@
 import { plainToClass } from 'class-transformer';
-import { validateSync, IsOptional } from 'class-validator';
+import { validateSync } from 'class-validator';
 
 /**
  * env vatiables

src/infrastructure/modules/index.ts

@@ -1 +1,2 @@
 export * from './app.module';
+export * from './search.module'

src/infrastructure/modules/search.module.ts

@@ -4,7 +4,7 @@ import { PapersController } from "src/application";
 import { SearchService } from "../../core/services/common/search.service";
 
 /**
- * search module
+ * Search module
  */
 @Module({
     imports: [

src/main.ts

@@ -19,6 +19,9 @@ async function bootstrap() {
     })
   );
 
+  /**
+   * Enabling URI-type versioning of the API
+   */
   app.enableVersioning({
     type: VersioningType.URI,
   });