feat: contributions a contributor needs helped with

Author: ZibanPirate

api/src/contribution/repository.ts

@@ -36,6 +36,28 @@ export class ContributionRepository {
     return camelCased;
   }
 
+  public async findForContributor(contributorId: string) {
+    const statement = sql`
+    SELECT
+      ${contributionsTable.id},
+      ${contributionsTable.title}
+    FROM
+      ${contributionsTable}
+    INNER JOIN
+      ${contributorsTable} ON ${contributionsTable.contributorId} = ${contributorsTable.id}
+    WHERE
+      ${contributorsTable.id} = ${contributorId}
+    ORDER BY
+      ${contributionsTable.updatedAt} DESC
+    `;
+
+    const raw = await this.postgresService.db.execute(statement);
+    const entries = Array.from(raw);
+    const unStringifiedRaw = unStringifyDeep(entries);
+    const camelCased = camelCaseObject(unStringifiedRaw);
+    return camelCased;
+  }
+
   public async upsert(contribution: ContributionRow) {
     return await this.postgresService.db
       .insert(contributionsTable)

api/src/contributor/controller.ts

@@ -4,13 +4,15 @@ import { Service } from "typedi";
 import { ContributorRepository } from "./repository";
 import { GetContributorResponse, GetContributorsResponse } from "./types";
 import { ProjectRepository } from "src/project/repository";
+import { ContributionRepository } from "src/contribution/repository";
 
 @Service()
 @Controller("/Contributors")
 export class ContributorController {
   constructor(
     private readonly contributorRepository: ContributorRepository,
     private readonly projectRepository: ProjectRepository,
+    private readonly contributionRepository: ContributionRepository,
   ) {}
 
   @Get("/")
@@ -24,9 +26,10 @@ export class ContributorController {
 
   @Get("/:id")
   public async getContributor(@Param("id") id: string): Promise<GetContributorResponse> {
-    const [contributor, projects] = await Promise.all([
+    const [contributor, projects, contributions] = await Promise.all([
       this.contributorRepository.findWithStats(id),
       this.projectRepository.findForContributor(id),
+      this.contributionRepository.findForContributor(id),
     ]);
 
     if (!contributor) throw new NotFoundError("Contributor not found");
@@ -35,8 +38,7 @@ export class ContributorController {
       contributor: {
         ...contributor,
         projects,
-        // @TODO-ZM: Add contributions
-        // contributions,
+        contributions,
       },
     };
   }

api/src/contributor/types.ts

@@ -1,3 +1,4 @@
+import { ContributionEntity } from "@dzcode.io/models/dist/contribution";
 import { ContributorEntity } from "@dzcode.io/models/dist/contributor";
 import { ProjectEntity } from "@dzcode.io/models/dist/project";
 import { GeneralResponse } from "src/app/types";
@@ -25,5 +26,6 @@ export interface GetContributorResponse extends GeneralResponse {
         ranking: number;
       }
     >;
+    contributions: Array<Pick<ContributionEntity, "id" | "title" | "type">>;
   };
 }

web/src/components/locale/dictionary.ts

@@ -251,6 +251,10 @@ Besides the open tasks on [/Contribute](/Contribute) page, you can also contribu
     en: "Contributed to projects",
     ar: "ساهم في المشاريع",
   },
+  "contributor-needs-help": {
+    en: "Needs help with",
+    ar: "يحتاج مساعدة في",
+  },
   "projects-title": {
     en: "Browse a growing list of Algerian open-source projects | DzCode i/o",
     ar: "تصفح قائمة المشاريع الجزائرية مفتوحة المصدر | DzCode i / o",

web/src/pages/team/contributor/index.tsx

@@ -4,10 +4,12 @@ import { useParams } from "react-router-dom";
 import { Link } from "src/components/link";
 import { Loading } from "src/components/loading";
 import { Locale, useLocale } from "src/components/locale";
+import { Markdown } from "src/components/markdown";
 import { Redirect } from "src/components/redirect";
 import { TryAgain } from "src/components/try-again";
 import { fetchContributorAction } from "src/redux/actions/contributor";
 import { useAppDispatch, useAppSelector } from "src/redux/store";
+import { getContributionURL } from "src/utils/contribution";
 import { getContributorURL } from "src/utils/contributor";
 import { getProjectURL } from "src/utils/project";
 
@@ -100,6 +102,24 @@ export default function Page(): JSX.Element {
                 </div>
               </>
             ) : null}
+            {contributor.contributions.length > 0 ? (
+              <>
+                <h2 className="text-lg font-bold">
+                  <Locale contributor-needs-help />
+                </h2>
+                <div className="flex flex-row gap-4 flex-wrap">
+                  {contributor.contributions.map((contribution, contributionIndex) => (
+                    <Link
+                      key={contributionIndex}
+                      href={getContributionURL(contribution)}
+                      className="card card-compact bg-base-200 rounded-lg p-4 w-full md:w-auto"
+                    >
+                      <Markdown content={contribution.title} />
+                    </Link>
+                  ))}
+                </div>
+              </>
+            ) : null}
           </div>
         )}
       </div>