Merge pull request #316 from dzcode-io/refactor/changed_printWidth_fr…

…om_80_to_100 changed printWidth from 80 to 100
dzcode-io · Jul 3, 2021 · 896f182 · 896f182
2 parents 31701c8 + 66031d2
commit 896f182
Show file tree

Hide file tree

Showing 61 changed files with 199 additions and 619 deletions.
diff --git a/api/.prettierrc b/api/.prettierrc
@@ -1,6 +1,6 @@
 {
   "singleQuote": false,
-  "printWidth": 80,
+  "printWidth": 100,
   "trailingComma": "all",
   "endOfLine": "auto"
 }
diff --git a/api/oracle-cloud/deploy.js b/api/oracle-cloud/deploy.js
@@ -8,10 +8,7 @@ console.log("⚙️  Preparing files ...");
 // root
 fse.copySync("../package.json", "./oracle-cloud/build/package.json");
 // common
-fse.copySync(
-  "../common/package.json",
-  "./oracle-cloud/build/common/package.json",
-);
+fse.copySync("../common/package.json", "./oracle-cloud/build/common/package.json");
 fse.copySync("../common/dist", "./oracle-cloud/build/common/dist");
 // data
 fse.copySync("../data/package.json", "./oracle-cloud/build/data/package.json");
@@ -20,10 +17,7 @@ fse.copySync("../data/models", "./oracle-cloud/build/data/models");
 // api
 fse.copySync("./package.json", "./oracle-cloud/build/api/package.json");
 fse.copySync("./dist", "./oracle-cloud/build/api/dist");
-fse.copySync(
-  "./oracle-cloud/docker-compose.yml",
-  "./oracle-cloud/build/docker-compose.yml",
-);
+fse.copySync("./oracle-cloud/docker-compose.yml", "./oracle-cloud/build/docker-compose.yml");
 fse.copySync("./oracle-cloud/Dockerfile", "./oracle-cloud/build/Dockerfile");
 console.log("✅ files copied\n");
 
@@ -32,9 +26,7 @@ const isProduction = process.argv.includes("production");
 console.log("⚙️  Deploying to", isProduction ? "Production" : "Staging", "...");
 
 let logs;
-const sshServer = isProduction
-  ? process.env.SSH_ADDRESS_PRD
-  : process.env.SSH_ADDRESS_STG;
+const sshServer = isProduction ? process.env.SSH_ADDRESS_PRD : process.env.SSH_ADDRESS_STG;
 const appPath = "~/app";
 const sshPrefix = "ssh -o StrictHostKeyChecking=no " + sshServer + " ";
 
@@ -61,17 +53,12 @@ logs = cp.execSync(sshPrefix + '"rm -f -r ' + appPath + '"');
 logs = cp.execSync(sshPrefix + '"mkdir ' + appPath + '"');
 
 console.log("⤴️  Uploading new code ...");
-logs = cp.execSync(
-  "rsync -r oracle-cloud/build/* " + sshServer + ":" + appPath,
-);
+logs = cp.execSync("rsync -r oracle-cloud/build/* " + sshServer + ":" + appPath);
 console.log("✅ New code uploaded.");
 
 console.log("\n⚙️  Starting up the app");
 logs = cp.execSync(
-  sshPrefix +
-    '"docker-compose -f ' +
-    appPath +
-    '/docker-compose.yml up -d --build"',
+  sshPrefix + '"docker-compose -f ' + appPath + '/docker-compose.yml up -d --build"',
 );
 console.log(String(logs));
 console.log("✅ Deployment successful.");
diff --git a/api/src/app/controllers/github/index.ts b/api/src/app/controllers/github/index.ts
@@ -16,10 +16,7 @@ export const listRepositories = async (req: Request, res: Response) => {
   }
 };
 
-export const listPullRequestsByRepository = async (
-  req: Request,
-  res: Response,
-) => {
+export const listPullRequestsByRepository = async (req: Request, res: Response) => {
   try {
     const pullRequests = await Github.listPullRequests({
       owner: "dzcode-io",
@@ -47,10 +44,7 @@ export const listStarsByRepository = async (req: Request, res: Response) => {
   }
 };
 
-export const listStargazersByRepository = async (
-  req: Request,
-  res: Response,
-) => {
+export const listStargazersByRepository = async (req: Request, res: Response) => {
   try {
     const Stargazers = await Github.listStargazers({
       owner: "dzcode-io",

diff --git a/api/src/app/index.ts b/api/src/app/index.ts
@@ -20,11 +20,7 @@ useContainer(Container);
 
 // Create the app:
 export const routingControllersOptions = {
-  controllers: [
-    ContributionController,
-    ContributorController,
-    GithubUserController,
-  ],
+  controllers: [ContributionController, ContributorController, GithubUserController],
   middlewares: [
     // middlewares:
     SecurityMiddleware,

diff --git a/api/src/app/middlewares/error.ts b/api/src/app/middlewares/error.ts
@@ -1,7 +1,4 @@
-import {
-  ExpressErrorMiddlewareInterface,
-  Middleware,
-} from "routing-controllers";
+import { ExpressErrorMiddlewareInterface, Middleware } from "routing-controllers";
 import { ErrorRequestHandler } from "express";
 import { GeneralResponseDto } from "@dzcode.io/common/dist/types/api-responses";
 import { LoggerService } from "../../logger/service";
@@ -12,12 +9,7 @@ import { Service } from "typedi";
 export class ErrorMiddleware implements ExpressErrorMiddlewareInterface {
   constructor(private loggerService: LoggerService) {}
 
-  error: ErrorRequestHandler<never, GeneralResponseDto, unknown> = (
-    err,
-    req,
-    res,
-    next,
-  ) => {
+  error: ErrorRequestHandler<never, GeneralResponseDto, unknown> = (err, req, res, next) => {
     // Logs error
     this.loggerService.error({
       message: "Internal Server Error",

diff --git a/api/src/app/services/github/index.ts b/api/src/app/services/github/index.ts
@@ -3,15 +3,9 @@
 import { ListContributorsResponse } from "../../../github/types";
 import axios from "axios";
 
-export const listOrganizationRepositories = async ({
-  org,
-}: {
-  org: string;
-}) => {
+export const listOrganizationRepositories = async ({ org }: { org: string }) => {
   try {
-    const response = await axios.get(
-      `https://api.github.com/orgs/${org}/repos`,
-    );
+    const response = await axios.get(`https://api.github.com/orgs/${org}/repos`);
 
     return response.data;
   } catch (error) {
@@ -20,23 +14,14 @@ export const listOrganizationRepositories = async ({
   }
 };
 
-export const listPullRequests = async ({
-  owner,
-  repo,
-}: {
-  owner: string;
-  repo: string;
-}) => {
+export const listPullRequests = async ({ owner, repo }: { owner: string; repo: string }) => {
   try {
-    const response = await axios.get(
-      `https://api.github.com/repos/${owner}/${repo}/pulls`,
-      {
-        params: {
-          state: "all",
-          per_page: 10,
-        },
+    const response = await axios.get(`https://api.github.com/repos/${owner}/${repo}/pulls`, {
+      params: {
+        state: "all",
+        per_page: 10,
       },
-    );
+    });
 
     return response.data;
   } catch (error) {
@@ -78,17 +63,9 @@ export const listContributors = async ({
   }
 };
 
-export const listStars = async ({
-  owner,
-  repo,
-}: {
-  owner: string;
-  repo: string;
-}) => {
+export const listStars = async ({ owner, repo }: { owner: string; repo: string }) => {
   try {
-    const response = await axios.get(
-      ` https://api.github.com/repos/${owner}/${repo}`,
-    );
+    const response = await axios.get(` https://api.github.com/repos/${owner}/${repo}`);
 
     return response.data;
   } catch (error) {
@@ -107,16 +84,13 @@ export const listStargazers = async ({
   page: number;
 }) => {
   try {
-    const response = await axios.get(
-      `https://api.github.com/repos/${owner}/${repo}/stargazers`,
-      {
-        params: {
-          state: "all",
-          per_page: 100,
-          page: page,
-        },
+    const response = await axios.get(`https://api.github.com/repos/${owner}/${repo}/stargazers`, {
+      params: {
+        state: "all",
+        per_page: 100,
+        page: page,
       },
-    );
+    });
 
     return response.data;
   } catch (error) {
@@ -125,86 +99,46 @@ export const listStargazers = async ({
   }
 };
 
-export const listBranches = async ({
-  owner,
-  repo,
-}: {
-  owner: string;
-  repo: string;
-}) => {
+export const listBranches = async ({ owner, repo }: { owner: string; repo: string }) => {
   try {
-    const response = await axios.get(
-      `  https://api.github.com/repos/${owner}/${repo}/branches`,
-    );
+    const response = await axios.get(`  https://api.github.com/repos/${owner}/${repo}/branches`);
     return response.data;
   } catch (error) {
     console.log("listBranches ERROR =>", error.response.data);
     return null;
   }
 };
-export const listCommits = async ({
-  owner,
-  repo,
-}: {
-  owner: string;
-  repo: string;
-}) => {
+export const listCommits = async ({ owner, repo }: { owner: string; repo: string }) => {
   try {
-    const response = await axios.get(
-      `  https://api.github.com/repos/${owner}/${repo}/commits`,
-    );
+    const response = await axios.get(`  https://api.github.com/repos/${owner}/${repo}/commits`);
     return response.data;
   } catch (error) {
     console.log("listCommits ERROR =>", error.response.data);
     return null;
   }
 };
 
-export const listForks = async ({
-  owner,
-  repo,
-}: {
-  owner: string;
-  repo: string;
-}) => {
+export const listForks = async ({ owner, repo }: { owner: string; repo: string }) => {
   try {
-    const response = await axios.get(
-      ` https://api.github.com/repos/${owner}/${repo}`,
-    );
+    const response = await axios.get(` https://api.github.com/repos/${owner}/${repo}`);
     return response.data;
   } catch (error) {
     console.log("listForks =>", error.response.data);
     return null;
   }
 };
-export const listIssues = async ({
-  owner,
-  repo,
-}: {
-  owner: string;
-  repo: string;
-}) => {
+export const listIssues = async ({ owner, repo }: { owner: string; repo: string }) => {
   try {
-    const response = await axios.get(
-      `https://api.github.com/repos/${owner}/${repo}`,
-    );
+    const response = await axios.get(`https://api.github.com/repos/${owner}/${repo}`);
     return response.data;
   } catch (error) {
     console.log("listIssues =>", error.response.data);
     return null;
   }
 };
-export const listWatchers = async ({
-  owner,
-  repo,
-}: {
-  owner: string;
-  repo: string;
-}) => {
+export const listWatchers = async ({ owner, repo }: { owner: string; repo: string }) => {
   try {
-    const response = await axios.get(
-      `https://api.github.com/repos/${owner}/${repo}`,
-    );
+    const response = await axios.get(`https://api.github.com/repos/${owner}/${repo}`);
     return response.data;
   } catch (error) {
     console.log("listWatchers =>", error.response.data);

diff --git a/api/src/config/service.ts b/api/src/config/service.ts
@@ -26,8 +26,7 @@ export class ConfigService {
     if (errors.length > 0)
       throw new Error(
         `⚠️  Errors in .env file in the following keys:${errors.reduce(
-          (pV, cV) =>
-            (pV += "\n" + cV.property + " : " + JSON.stringify(cV.constraints)),
+          (pV, cV) => (pV += "\n" + cV.property + " : " + JSON.stringify(cV.constraints)),
           "",
         )}`,
       );

diff --git a/api/src/contribution/controller.ts b/api/src/contribution/controller.ts
@@ -10,27 +10,21 @@ import { Service } from "typedi";
 @Service()
 @Controller("/Contributions")
 export class ContributionController {
-  constructor(
-    private readonly contributionRepository: ContributionRepository,
-  ) {}
+  constructor(private readonly contributionRepository: ContributionRepository) {}
 
   @Get("/")
   @OpenAPI({
-    summary:
-      "Return a list of contributions for all projects listed in dzcode.io",
+    summary: "Return a list of contributions for all projects listed in dzcode.io",
   })
   @ResponseSchema(GetContributionsResponseDto)
   public async getContributions(
     @QueryParams() { labels, languages, projects }: GetContributionsQueryDto,
   ): Promise<GetContributionsResponseDto> {
     const { contributions, filters } = await this.contributionRepository.find(
       (contribution) =>
-        (labels.length === 0 ||
-          labels.some((label) => contribution.labels.includes(label))) &&
+        (labels.length === 0 || labels.some((label) => contribution.labels.includes(label))) &&
         (languages.length === 0 ||
-          languages.some((language) =>
-            contribution.languages.includes(language),
-          )) &&
+          languages.some((language) => contribution.languages.includes(language))) &&
         (projects.length === 0 ||
           projects.some((project) => {
             return contribution.project.slug === project;

diff --git a/api/src/contribution/mock.ts b/api/src/contribution/mock.ts
@@ -1,8 +1,4 @@
-import {
-  ContributionEntity,
-  FilterEntity,
-  OptionEntity,
-} from "@dzcode.io/common/dist/types";
+import { ContributionEntity, FilterEntity, OptionEntity } from "@dzcode.io/common/dist/types";
 import { lorem } from "faker";
 
 export const generateContributionMock = (index: number): ContributionEntity => {
@@ -33,10 +29,7 @@ export const bulkGenerateContributionMock = (from: number, to: number) => {
     { label: "Label", name: "labels", options: [] },
   ];
 
-  const pushUniqueOption = (
-    options: OptionEntity[],
-    filterOptions: OptionEntity[],
-  ) => {
+  const pushUniqueOption = (options: OptionEntity[], filterOptions: OptionEntity[]) => {
     const uniqueOptions = options.filter(
       (_option) => !filterOptions.some(({ name }) => _option.name === name),
     );