Skip to content

Commit

Permalink
Fix eslint and ts build errors to unblock CI
Browse files Browse the repository at this point in the history
  • Loading branch information
thesocialdev authored and pepermao committed Sep 30, 2023
1 parent 58eaec0 commit d7984bf
Show file tree
Hide file tree
Showing 22 changed files with 30 additions and 34 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@
"seed:ci": "yarn build-ts && yarn build-nest && yarn copy-html-files && node dist/server/command.js -c config.seed.test.ci.yaml",
"dev": "yarn copy-static-assets && concurrently -k -p \"[{name}]\" -n \"TypeScript,Node\" -c \"cyan.bold,green.bold\" \"yarn watch-ts\" \"yarn watch-node\"",
"test": "env-cmd --silent jest --detectOpenHandles --forceExit",
"build": "yarn build-ts && yarn build-nest && yarn copy-static-assets && yarn copy-html-files && next build",
"build": "yarn build-ts && yarn build-nest && yarn copy-static-assets && yarn copy-html-files && yarn build-next",
"build-ts": "tsc",
"build-nest": "nest build -p ./server/tsconfig.json",
"build-next": "next build",
"watch-ts": "tsc --project ./server/tsconfig.json -w",
"debug": "yarn build && yarn watch-debug",
"lint": "tsc --noEmit && yarn lint:check",
Expand Down
8 changes: 2 additions & 6 deletions server/auth/ory/ory.controller.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
import { Controller, Get, Post, Req, Res } from "@nestjs/common";
import { ConfigService } from "@nestjs/config";
import { NextApiRequest, NextApiResponse } from "next";
import type { NextApiRequest, NextApiResponse } from "next";
import { parse } from "url";
import { ViewService } from "../../view/view.service";
import OryService from "./ory.service";
import { IsPublic } from "../decorators/is-public.decorator";

@Controller()
export default class OryController {
constructor(
private configService: ConfigService,
private viewService: ViewService,
private oryService: OryService
) {}
constructor(private viewService: ViewService) {}

@IsPublic()
@Get("api/.ory/*")
Expand Down
2 changes: 1 addition & 1 deletion server/badge/badge.controller.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Body, Controller, Get, Post, Put, Req, Res } from "@nestjs/common";
import { Request, Response } from "express";
import type { Request, Response } from "express";
import { ImageService } from "../claim/types/image/image.service";
import { parse } from "url";

Expand Down
2 changes: 1 addition & 1 deletion server/claim-review-task/claim-review-task.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { CreateClaimReviewTaskDTO } from "./dto/create-claim-review-task.dto";
import { UpdateClaimReviewTaskDTO } from "./dto/update-claim-review-task.dto";
import { CaptchaService } from "../captcha/captcha.service";
import { parse } from "url";
import { Request, Response } from "express";
import type { Request, Response } from "express";
import { ViewService } from "../view/view.service";
import { GetTasksDTO } from "./dto/get-tasks.dto";
import { getQueryMatchForMachineValue } from "./mongo-utils";
Expand Down
2 changes: 1 addition & 1 deletion server/claim-review-task/claim-review-task.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { HistoryService } from "../history/history.service";
import { StateEventService } from "../state-event/state-event.service";
import { TypeModel } from "../state-event/schema/state-event.schema";
import { REQUEST } from "@nestjs/core";
import { BaseRequest } from "../types";
import type { BaseRequest } from "../types";
import { SentenceService } from "../claim/types/sentence/sentence.service";
import { getQueryMatchForMachineValue } from "./mongo-utils";
import { Roles } from "../auth/ability/ability.factory";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as mongoose from "mongoose";
import { Prop, Schema, SchemaFactory } from "@nestjs/mongoose";
import { Machine } from "../dto/create-claim-review-task.dto";
import type { Machine } from "../dto/create-claim-review-task.dto";

export type ClaimReviewTaskDocument = ClaimReviewTask & mongoose.Document;

Expand Down
3 changes: 1 addition & 2 deletions server/claim-review/claim-review.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@ import { ISoftDeletedModel } from "mongoose-softdelete-typescript";
import { ReportDocument } from "../report/schemas/report.schema";
import { SentenceService } from "../claim/types/sentence/sentence.service";
import { REQUEST } from "@nestjs/core";
import { BaseRequest } from "../types";
import type { BaseRequest } from "../types";
import { ImageService } from "../claim/types/image/image.service";
import { ContentModelEnum } from "../types/enums";

@Injectable({ scope: Scope.REQUEST })
export class ClaimReviewService {
private readonly logger = new Logger("ClaimReviewService");
constructor(
@Inject(REQUEST) private req: BaseRequest,
@InjectModel(ClaimReview.name)
Expand Down
2 changes: 1 addition & 1 deletion server/claim-review/schemas/claim-review.schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Personality } from "../../personality/schemas/personality.schema";
import * as mongoose from "mongoose";
import { Claim } from "../../claim/schemas/claim.schema";
import { softDeletePlugin } from "mongoose-softdelete-typescript";
import { ReportDocument } from "../../report/schemas/report.schema";
import type { ReportDocument } from "../../report/schemas/report.schema";
import { User } from "../../users/schemas/user.schema";

export type ClaimReviewDocument = ClaimReview & mongoose.Document;
Expand Down
4 changes: 2 additions & 2 deletions server/claim/claim.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
import { ClaimReviewService } from "../claim-review/claim-review.service";
import { ClaimService } from "./claim.service";
import { ConfigService } from "@nestjs/config";
import { Request, Response } from "express";
import type { Request, Response } from "express";
import { parse } from "url";
import { PersonalityService } from "../personality/personality.service";
import { ViewService } from "../view/view.service";
Expand All @@ -32,7 +32,7 @@ import { CaptchaService } from "../captcha/captcha.service";
import { ClaimReviewTaskService } from "../claim-review-task/claim-review-task.service";
import { TargetModel } from "../history/schema/history.schema";
import { SentenceService } from "./types/sentence/sentence.service";
import { BaseRequest } from "../types";
import type { BaseRequest } from "../types";
import slugify from "slugify";
import { UnleashService } from "nestjs-unleash";
import { ContentModelEnum } from "../types/enums";
Expand Down
2 changes: 1 addition & 1 deletion server/claim/claim.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { HistoryType, TargetModel } from "../history/schema/history.schema";
import { TypeModel } from "../state-event/schema/state-event.schema";
import { ISoftDeletedModel } from "mongoose-softdelete-typescript";
import { REQUEST } from "@nestjs/core";
import { BaseRequest } from "../types";
import type { BaseRequest } from "../types";
import { ContentModelEnum } from "../types/enums";
import { ClaimReviewTaskService } from "../claim-review-task/claim-review-task.service";

Expand Down
4 changes: 2 additions & 2 deletions server/claim/parser/parser.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe("ParserService", () => {
});

beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
const testingModule: TestingModule = await Test.createTestingModule({
imports: [
MongooseModule.forRoot(
TestConfigOptions.config.db.connection_uri,
Expand All @@ -29,7 +29,7 @@ describe("ParserService", () => {
],
providers: [ParserService],
}).compile();
parserService = module.get<ParserService>(ParserService);
parserService = testingModule.get<ParserService>(ParserService);
});

describe("parse()", () => {
Expand Down
2 changes: 1 addition & 1 deletion server/claim/types/debate/debate.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
TargetModel,
} from "../../../history/schema/history.schema";
import { REQUEST } from "@nestjs/core";
import { BaseRequest } from "../../../types";
import type { BaseRequest } from "../../../types";
const md5 = require("md5");

@Injectable({ scope: Scope.REQUEST })
Expand Down
2 changes: 1 addition & 1 deletion server/claim/types/image/image.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
} from "../../../history/schema/history.schema";
import { REQUEST } from "@nestjs/core";
import { ReportService } from "../../../report/report.service";
import { BaseRequest } from "../../../types";
import type { BaseRequest } from "../../../types";

@Injectable({ scope: Scope.REQUEST })
export class ImageService {
Expand Down
2 changes: 1 addition & 1 deletion server/filters/not-found.filter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
NotFoundException,
Logger,
} from "@nestjs/common";
import { Response, Request } from "express";
import type { Request, Response } from "express";

@Catch(NotFoundException)
export class NotFoundFilter implements ExceptionFilter {
Expand Down
2 changes: 1 addition & 1 deletion server/filters/unauthorized.filter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
ExceptionFilter,
UnauthorizedException,
} from "@nestjs/common";
import { Response } from "express";
import type { Response } from "express";

/**
* Filters out Unauthorized Exception and redirect to our custom acess denied page, avoiding the default json error message
Expand Down
4 changes: 2 additions & 2 deletions server/home/home.controller.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { Controller, Get, Header, Redirect, Req, Res } from "@nestjs/common";
import { ViewService } from "../view/view.service";
import { Response } from "express";
import type { Response } from "express";
import { parse } from "url";
import { PersonalityService } from "../personality/personality.service";
import { StatsService } from "../stats/stats.service";
import { IsPublic } from "../auth/decorators/is-public.decorator";
import { BaseRequest } from "../types";
import type { BaseRequest } from "../types";
import { DebateService } from "../claim/types/debate/debate.service";
import { ClaimRevisionService } from "../claim/claim-revision/claim-revision.service";
import { ApiTags } from "@nestjs/swagger";
Expand Down
4 changes: 2 additions & 2 deletions server/personality/personality.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ import {
Res,
} from "@nestjs/common";
import { parse } from "url";
import { Request, Response } from "express";
import type { Request, Response } from "express";
import { ViewService } from "../view/view.service";
import { PersonalityService } from "./personality.service";
import { GetPersonalities } from "./dto/get-personalities.dto";
import { CreatePersonalityDTO } from "./dto/create-personality.dto";
import { IsPublic } from "../auth/decorators/is-public.decorator";
import { TargetModel } from "../history/schema/history.schema";
import { BaseRequest } from "../types";
import type { BaseRequest } from "../types";
import { ApiTags } from "@nestjs/swagger";

@Controller()
Expand Down
2 changes: 1 addition & 1 deletion server/personality/personality.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { HistoryService } from "../history/history.service";
import { HistoryType, TargetModel } from "../history/schema/history.schema";
import { ISoftDeletedModel } from "mongoose-softdelete-typescript";
import { REQUEST } from "@nestjs/core";
import { BaseRequest } from "../types";
import type { BaseRequest } from "../types";

export interface FindAllOptions {
searchText: string;
Expand Down
4 changes: 2 additions & 2 deletions server/search/search.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import { PersonalityService } from "../personality/personality.service";
import { SentenceService } from "../claim/types/sentence/sentence.service";
import { ViewService } from "../view/view.service";
import { parse } from "url";
import { Response } from "express";
import { BaseRequest } from "../types";
import type { Response } from "express";
import type { BaseRequest } from "../types";
import { ApiTags } from "@nestjs/swagger";

@Controller()
Expand Down
2 changes: 1 addition & 1 deletion server/types/BaseRequest.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Roles } from "../auth/ability/ability.factory";
import { Request } from "express";
import type { Request } from "express";

export type BaseRequest = Request & {
user: { _id: string; role: Roles };
Expand Down
4 changes: 2 additions & 2 deletions server/users/users.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ import {
UnprocessableEntityException,
UseGuards,
} from "@nestjs/common";
import { Request, Response } from "express";
import type { Request, Response } from "express";
import { UsersService } from "./users.service";
import { parse } from "url";
import { ViewService } from "../view/view.service";
import { ConfigService } from "@nestjs/config";
import { IsPublic } from "../auth/decorators/is-public.decorator";
import { BaseRequest } from "../types";
import type { BaseRequest } from "../types";
import { Types } from "mongoose";
import { CreateUserDTO } from "./dto/create-user.dto";
import { AbilitiesGuard } from "../auth/ability/abilities.guard";
Expand Down
2 changes: 1 addition & 1 deletion server/view/view.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
Header,
Query,
} from "@nestjs/common";
import { Request, Response } from "express";
import type { Request, Response } from "express";
import { parse } from "url";
import { ViewService } from "./view.service";
import { IsPublic } from "../auth/decorators/is-public.decorator";
Expand Down

0 comments on commit d7984bf

Please sign in to comment.