Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
751 changes: 91 additions & 660 deletions lib/user-agents.ts

Large diffs are not rendered by default.

355 changes: 166 additions & 189 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"dependencies": {
"@typegoose/typegoose": "^6.1.8",
"amqplib": "0.5.2",
"axios": "^0.19.0",
"axios": "^0.21.1",
"bluebird": "3.5.1",
"body-parser": "^1.19.0",
"bunyan": "1.8.12",
Expand All @@ -33,9 +33,9 @@
"inversify": "^5.0.1",
"inversify-express-utils": "^6.3.2",
"jsonwebtoken": "^8.3.0",
"lodash": "^4.17.15",
"lodash": "^4.17.21",
"moment": "2.22.2",
"mongoose": "^5.8.0",
"mongoose": "^5.12.3",
"reflect-metadata": "^0.1.13",
"source-map-support": "^0.5.9",
"umetrics": "^1.0.4",
Expand Down
3 changes: 3 additions & 0 deletions services/api/metrics/vk-user-ban-metrics.interface.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export interface VkUserBanMetricsInterface {
increaseBannedBot(login: string);
}
3 changes: 2 additions & 1 deletion services/api/metrics/vk-users-ban-metrics.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ import { CommentsByStrategyTask } from '../comments-by-strategy/comments-by-stra
import { injectModel } from '../../../lib/inversify-typegoose/inject-model';
import { JoinToGroupTask } from '../vk-users/join-to-group.task';
import { CoverageImprovementTask } from '../coverage-improvement/coverage-improvement.task';
import { VkUserBanMetricsInterface } from './vk-user-ban-metrics.interface';

@injectable()
export class VkUsersBanMetricsService {
export class VkUsersBanMetricsService implements VkUserBanMetricsInterface {
private readonly uMetrics: UMetrics;

constructor(
Expand Down
2 changes: 1 addition & 1 deletion services/api/task/task.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export class TaskService implements TaskServiceInterface {
throw new PendingTaskException(id);
}

await this.CommonTaskModel.update({ _id: id }, { $set: { deletedAt: moment.now() } });
await this.CommonTaskModel.update({ _id: id }, { $set: { deletedAt: moment() } });
}

async skipAllSubTasks(parentTaskId: Types.ObjectId | string) {
Expand Down
7 changes: 7 additions & 0 deletions services/api/tests/api/auth.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ import { createApplication } from '../../create-application';
import { TaskMetricsServiceInterface } from '../../metrics/task-metrics-service.interface';
import { TaskMetricsService } from '../../metrics/task-metrics.service';
import { taskMetricsServiceMock } from '../mocks/task-metrics-service.mock';
import { VkUsersBanMetricsService } from '../../metrics/vk-users-ban-metrics.service';
import { vkUserBanMetricServiceMock } from '../mocks/vk-user-ban-metric-service.mock';
import { VkUserBanMetricsInterface } from '../../metrics/vk-user-ban-metrics.interface';

describe('Auth API', () => {
let ctx;
Expand All @@ -18,6 +21,10 @@ describe('Auth API', () => {
container
.bind<TaskMetricsServiceInterface>(TaskMetricsService)
.toConstantValue(taskMetricsServiceMock);
container
.bind<VkUserBanMetricsInterface>(VkUsersBanMetricsService)
.toConstantValue(vkUserBanMetricServiceMock);

const database = container.get(Database);

await database.connect();
Expand Down
8 changes: 8 additions & 0 deletions services/api/tests/api/comment-by-strategy.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ import { AuthProviderMock } from '../fixtures/auth-provider.mock';
import { TaskMetricsServiceInterface } from '../../metrics/task-metrics-service.interface';
import { TaskMetricsService } from '../../metrics/task-metrics.service';
import { taskMetricsServiceMock } from '../mocks/task-metrics-service.mock';
import { VkUserBanMetricsInterface } from '../../metrics/vk-user-ban-metrics.interface';
import { VkUsersBanMetricsService } from '../../metrics/vk-users-ban-metrics.service';
import { vkUserBanMetricServiceMock } from '../mocks/vk-user-ban-metric-service.mock';

describe('Comment by strategy API', () => {
let ctx = null;
Expand All @@ -25,6 +28,11 @@ describe('Comment by strategy API', () => {
container
.bind<TaskMetricsServiceInterface>(TaskMetricsService)
.toConstantValue(taskMetricsServiceMock);

container
.bind<VkUserBanMetricsInterface>(VkUsersBanMetricsService)
.toConstantValue(vkUserBanMetricServiceMock);

const database = container.get(Database);

await database.connect();
Expand Down
6 changes: 6 additions & 0 deletions services/api/tests/api/common-task.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ import { AuthProviderMock } from '../fixtures/auth-provider.mock';
import { TaskMetricsService } from '../../metrics/task-metrics.service';
import { taskMetricsServiceMock } from '../mocks/task-metrics-service.mock';
import { TaskMetricsServiceInterface } from '../../metrics/task-metrics-service.interface';
import { VkUserBanMetricsInterface } from '../../metrics/vk-user-ban-metrics.interface';
import { VkUsersBanMetricsService } from '../../metrics/vk-users-ban-metrics.service';
import { vkUserBanMetricServiceMock } from '../mocks/vk-user-ban-metric-service.mock';

describe('Common task API', () => {
let ctx = null;
Expand All @@ -25,6 +28,9 @@ describe('Common task API', () => {
container
.bind<TaskMetricsServiceInterface>(TaskMetricsService)
.toConstantValue(taskMetricsServiceMock);
container
.bind<VkUserBanMetricsInterface>(VkUsersBanMetricsService)
.toConstantValue(vkUserBanMetricServiceMock);
const database = container.get(Database);

await database.connect();
Expand Down
6 changes: 6 additions & 0 deletions services/api/tests/mocks/vk-user-ban-metric-service.mock.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { Mocked } from '../types';
import { VkUserBanMetricsInterface } from '../../metrics/vk-user-ban-metrics.interface';

export const vkUserBanMetricServiceMock: Mocked<VkUserBanMetricsInterface> = {
increaseBannedBot: jest.fn(),
};