10-6 [BE] [검색리스트] pagination 범위 초과시 error 처리

backend/src/search/search.controller.ts

@@ -1,9 +1,10 @@
-import { Controller, Get, Query, UsePipes, ValidationPipe } from '@nestjs/common';
+import { Controller, Get, NotFoundException, Query, UsePipes, ValidationPipe } from '@nestjs/common';
 import { SearchService } from './search.service';
 
 import { KeywordValidationPipe } from './pipe/search.pipe';
 import { SearchDto } from './pipe/search.dto';
 import { SearchTotalHits } from '@elastic/elasticsearch/lib/api/types';
+import { PaperInfoExtended } from './entities/crossRef.entity';
 import { CROSSREF_CACHE_QUEUE } from 'src/util';
 import { Interval } from '@nestjs/schedule';
 import { RankingService } from 'src/ranking/ranking.service';
@@ -18,7 +19,9 @@ export class SearchController {
  if (elasticDataCount > 0) {
  return elastic.hits.hits.map((paper) => paper._source);
  }
- const { items, totalItems } = await this.searchService.getCrossRefAutoCompleteData(keyword);
+
+ const selects = ['title', 'author', 'DOI'];
+ const { items, totalItems } = await this.searchService.getCrossRefData(keyword, 5, 1, selects);
  const papers = this.searchService.parseCrossRefData(items);
  this.searchService.crawlAllCrossRefData(keyword, totalItems, 1000);
  return papers;
@@ -28,14 +31,22 @@ export class SearchController {
  @UsePipes(new ValidationPipe({ transform: true }))
  async getPapers(@Query('keyword', KeywordValidationPipe) keyword: string, @Query() query: SearchDto) {
  const { rows, page } = query;
- const { items, totalItems } = await this.searchService.getCrossRefData(keyword, rows, page);
- const papers = this.searchService.parseCrossRefData(items);
+ const selects = ['title', 'author', 'created', 'is-referenced-by-count', 'references-count', 'DOI'];
+ const { items, totalItems } = await this.searchService.getCrossRefData(keyword, rows, page, selects);
+
+ const totalPages = Math.ceil(totalItems / rows);
+ if (page > totalPages) {
+ throw new NotFoundException(`page(${page})는 ${totalPages} 보다 클 수 없습니다.`);
+ }
+
+ const papers = this.searchService.parseCrossRefData<PaperInfoExtended>(items);
  this.rankingService.insertRedis(keyword);
+
  return {
  papers,
  pageInfo: {
  totalItems,
- totalPages: Math.ceil(totalItems / rows),
+ totalPages,
  },
  };
  }

backend/src/search/search.module.ts

@@ -8,7 +8,12 @@ import { ScheduleModule } from '@nestjs/schedule';
 import { RankingService } from 'src/ranking/ranking.service';
 @Module({
  imports: [
- HttpModule,
+ HttpModule.register({
+ timeout: 20000,
+ headers: {
+ 'User-Agent': `Axios/1.1.3(mailto:${process.env.MAIL_TO})`,
+ },
+ }),
  ElasticsearchModule.registerAsync({
  useFactory: () => ({
  node: process.env.ELASTIC_HOST,

backend/src/search/search.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, RequestTimeoutException } from '@nestjs/common';
 import { HttpService } from '@nestjs/axios';
 import { CrossRefResponse, CrossRefItem, PaperInfoExtended, PaperInfo } from './entities/crossRef.entity';
 import { CROSSREF_API_URL, CROSSREF_CACHE_QUEUE } from '../util';
@@ -8,22 +8,12 @@ import { SearchHit } from '@elastic/elasticsearch/lib/api/types';
 @Injectable()
 export class SearchService {
  constructor(private readonly httpService: HttpService, private readonly esService: ElasticsearchService) {}
- async getCrossRefAutoCompleteData(keyword: string) {
- const crossRefdata = await this.httpService.axiosRef.get<CrossRefResponse>(CROSSREF_API_URL(keyword));
- const items = crossRefdata.data.message.items;
- const totalItems = crossRefdata.data.message['total-results'];
- return { items, totalItems };
- }
-
- async getCrossRefData(keyword: string, rows: number, page: number) {
- const crossRefdata = await this.httpService.axiosRef.get<CrossRefResponse>(
- CROSSREF_API_URL(
- keyword,
- rows,
- ['title', 'author', 'created', 'is-referenced-by-count', 'references-count', 'DOI'],
- page,
- ),
- );
+ async getCrossRefData(keyword: string, rows: number, page: number, selects?: string[]) {
+ const crossRefdata = await this.httpService.axiosRef
+ .get<CrossRefResponse>(CROSSREF_API_URL(keyword, rows, page, selects))
+ .catch((err) => {
+ throw new RequestTimeoutException(err.message);
+ });
  const items = crossRefdata.data.message.items;
  const totalItems = crossRefdata.data.message['total-results'];
  return { items, totalItems };
@@ -35,17 +25,19 @@ export class SearchService {
  .fill(0)
  .map((v, i) => {
  CROSSREF_CACHE_QUEUE.push(
- CROSSREF_API_URL(
- keyword,
- rows,
- ['title', 'author', 'created', 'is-referenced-by-count', 'references-count', 'DOI'],
- i + 1,
- ),
+ CROSSREF_API_URL(keyword, rows, i + 1, [
+ 'title',
+ 'author',
+ 'created',
+ 'is-referenced-by-count',
+ 'references-count',
+ 'DOI',
+ ]),
  );
  }),
  );
  }
- parseCrossRefData(items: CrossRefItem[]) {
+ parseCrossRefData<T extends PaperInfo>(items: CrossRefItem[]) {
  return items
  .map((item) => {
  const paperInfo = new PaperInfoExtended();
@@ -59,9 +51,9 @@ export class SearchService {
  paperInfo.publishedAt = item.created?.['date-time'];
  paperInfo.citations = item['is-referenced-by-count'];
  paperInfo.references = item['references-count'];
- return paperInfo;
+ return paperInfo as T;
  })
- .filter((info) => info.title || info.authors?.length > 0);
+ .filter((info) => info.title);
  }
  async putElasticSearch(paper: PaperInfoExtended) {
  return await this.esService.index({

backend/src/util.ts

@@ -1,5 +1,5 @@
-export const CROSSREF_API_URL = (keyword: string, rows = 5, selects: string[] = ['author', 'title', 'DOI'], page = 1) =>
+export const CROSSREF_API_URL = (keyword: string, rows = 5, page = 1, selects: string[] = ['author', 'title', 'DOI']) =>
  `https://api.crossref.org/works?query=${keyword}&rows=${rows}&select=${selects.join(',')}&offset=${
  rows * (page - 1)
- }`;
+ }&mailto=${process.env.MAIL_TO}&sort=is-referenced-by-count`;
 export const CROSSREF_CACHE_QUEUE = [];