Замена модели типов на новую
This commit is contained in:
parent
d90b2fd0b6
commit
b20ecee667
1 changed files with 5 additions and 5 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import { RedmineIssueData } from '../models/RedmineIssueData';
|
|
||||||
import { Injectable, Logger } from '@nestjs/common';
|
import { Injectable, Logger } from '@nestjs/common';
|
||||||
import { ConfigService } from '@nestjs/config';
|
import { ConfigService } from '@nestjs/config';
|
||||||
|
import { RedmineTypes } from '@app/redmine-types/index';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class RedmineDataLoader {
|
export class RedmineDataLoader {
|
||||||
|
|
@ -13,13 +13,13 @@ export class RedmineDataLoader {
|
||||||
this.urlPrefix = this.configService.get<string>('redmineUrlPrefix');
|
this.urlPrefix = this.configService.get<string>('redmineUrlPrefix');
|
||||||
}
|
}
|
||||||
|
|
||||||
async loadIssues(issues: number[]): Promise<(RedmineIssueData | null)[]> {
|
async loadIssues(issues: number[]): Promise<(RedmineTypes.Issue | null)[]> {
|
||||||
const promises = issues.map((issue) => this.loadIssue(issue));
|
const promises = issues.map((issue) => this.loadIssue(issue));
|
||||||
return Promise.all(promises);
|
return Promise.all(promises);
|
||||||
}
|
}
|
||||||
|
|
||||||
async loadIssue(issueNumber: number): Promise<RedmineIssueData | null> {
|
async loadIssue(issueNumber: number): Promise<RedmineTypes.Issue | null> {
|
||||||
const url = this.getUrl(issueNumber);
|
const url = this.getIssueUrl(issueNumber);
|
||||||
const resp = await axios.get(url);
|
const resp = await axios.get(url);
|
||||||
if (!resp || !resp.data || !resp.data.issue) {
|
if (!resp || !resp.data || !resp.data.issue) {
|
||||||
this.logger.error(
|
this.logger.error(
|
||||||
|
|
@ -33,7 +33,7 @@ export class RedmineDataLoader {
|
||||||
return resp.data.issue;
|
return resp.data.issue;
|
||||||
}
|
}
|
||||||
|
|
||||||
private getUrl(issueNumber: number): string {
|
private getIssueUrl(issueNumber: number): string {
|
||||||
if (typeof this.urlPrefix !== 'string' || this.urlPrefix.length === 0) {
|
if (typeof this.urlPrefix !== 'string' || this.urlPrefix.length === 0) {
|
||||||
throw 'REDMINE_URL_PREFIX is undefined';
|
throw 'REDMINE_URL_PREFIX is undefined';
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue