fix: fixed so many fucking things i cant even

Author: AndySakov

src/jobs/jobs.service.ts

@@ -153,6 +153,8 @@ export class JobDetailsEntity {
                   project?.grants?.map(grant => ({
                     ...grant,
                     //TODO: remove this once we have a better way to handle this
+                    tokenAmount: nonZeroOrNull(grant?.tokenAmount),
+                    tokenUnit: notStringOrNull(grant?.tokenUnit),
                     programName: notStringOrNull(grant?.programName) ?? "N/A",
                     createdTimestamp: nonZeroOrNull(grant?.createdTimestamp),
                     updatedTimestamp: nonZeroOrNull(grant?.updatedTimestamp),

src/shared/entities/job-details.entity.ts

@@ -214,6 +214,8 @@ export class JobListResultEntity {
                   project?.grants?.map(grant => ({
                     ...grant,
                     //TODO: remove this once we have a better way to handle this
+                    tokenAmount: nonZeroOrNull(grant?.tokenAmount),
+                    tokenUnit: notStringOrNull(grant?.tokenUnit),
                     programName: notStringOrNull(grant?.programName) ?? "N/A",
                     createdTimestamp: nonZeroOrNull(grant?.createdTimestamp),
                     updatedTimestamp: nonZeroOrNull(grant?.updatedTimestamp),
@@ -237,6 +239,8 @@ export class JobListResultEntity {
               organization?.grants?.map(grant => ({
                 ...grant,
                 //TODO: remove this once we have a better way to handle this
+                tokenAmount: nonZeroOrNull(grant?.tokenAmount),
+                tokenUnit: notStringOrNull(grant?.tokenUnit),
                 programName: notStringOrNull(grant?.programName) ?? "N/A",
                 createdTimestamp: nonZeroOrNull(grant?.createdTimestamp),
                 updatedTimestamp: nonZeroOrNull(grant?.updatedTimestamp),

src/shared/entities/job-list-result.entity.ts

@@ -111,6 +111,8 @@ export class OrgDetailsResultEntity {
             project?.grants?.map(grant => ({
               ...grant,
               //TODO: remove this once we have a better way to handle this
+              tokenAmount: nonZeroOrNull(grant?.tokenAmount),
+              tokenUnit: notStringOrNull(grant?.tokenUnit),
               programName: notStringOrNull(grant?.programName) ?? "N/A",
               createdTimestamp: nonZeroOrNull(grant?.createdTimestamp),
               updatedTimestamp: nonZeroOrNull(grant?.updatedTimestamp),
@@ -176,6 +178,8 @@ export class OrgDetailsResultEntity {
         grants?.map(grant => ({
           ...grant,
           //TODO: remove this once we have a better way to handle this
+          tokenAmount: nonZeroOrNull(grant?.tokenAmount),
+          tokenUnit: notStringOrNull(grant?.tokenUnit),
           programName: notStringOrNull(grant?.programName) ?? "N/A",
           createdTimestamp: nonZeroOrNull(grant?.createdTimestamp),
           updatedTimestamp: nonZeroOrNull(grant?.updatedTimestamp),

src/shared/entities/org-details-result.entity.ts

@@ -138,6 +138,8 @@ export class OrganizationWithLinksEntity {
         grants?.map(grant => ({
           ...grant,
           //TODO: remove this once we have a better way to handle this
+          tokenAmount: nonZeroOrNull(grant?.tokenAmount),
+          tokenUnit: notStringOrNull(grant?.tokenUnit),
           programName: notStringOrNull(grant?.programName) ?? "N/A",
           createdTimestamp: nonZeroOrNull(grant?.createdTimestamp),
           updatedTimestamp: nonZeroOrNull(grant?.updatedTimestamp),

src/shared/entities/organization-with-links.entity.ts

@@ -41,6 +41,8 @@ export class OrganizationWithRelationsEntity {
         organization?.grants?.map(grant => ({
           ...grant,
           //TODO: remove this once we have a better way to handle this
+          tokenAmount: nonZeroOrNull(grant?.tokenAmount),
+          tokenUnit: notStringOrNull(grant?.tokenUnit),
           programName: notStringOrNull(grant?.programName) ?? "N/A",
           createdTimestamp: nonZeroOrNull(grant?.createdTimestamp),
           updatedTimestamp: nonZeroOrNull(grant?.updatedTimestamp),

src/shared/entities/organization-with-relations.entity.ts

@@ -100,6 +100,8 @@ export class ProjectDetailsEntity {
           organization?.grants?.map(grant => ({
             ...grant,
             //TODO: remove this once we have a better way to handle this
+            tokenAmount: nonZeroOrNull(grant?.tokenAmount),
+            tokenUnit: notStringOrNull(grant?.tokenUnit),
             programName: notStringOrNull(grant?.programName) ?? "N/A",
             createdTimestamp: nonZeroOrNull(grant?.createdTimestamp),
             updatedTimestamp: nonZeroOrNull(grant?.updatedTimestamp),
@@ -136,6 +138,8 @@ export class ProjectDetailsEntity {
         project?.grants?.map(grant => ({
           ...grant,
           //TODO: remove this once we have a better way to handle this
+          tokenAmount: nonZeroOrNull(grant?.tokenAmount),
+          tokenUnit: notStringOrNull(grant?.tokenUnit),
           programName: notStringOrNull(grant?.programName) ?? "N/A",
           createdTimestamp: nonZeroOrNull(grant?.createdTimestamp),
           updatedTimestamp: nonZeroOrNull(grant?.updatedTimestamp),

src/shared/entities/project-details.entity.ts

@@ -59,6 +59,8 @@ export class ProjectWithBaseRelationsEntity {
         project?.grants?.map(grant => ({
           ...grant,
           //TODO: remove this once we have a better way to handle this
+          tokenAmount: nonZeroOrNull(grant?.tokenAmount),
+          tokenUnit: notStringOrNull(grant?.tokenUnit),
           programName: notStringOrNull(grant?.programName) ?? "N/A",
           createdTimestamp: nonZeroOrNull(grant?.createdTimestamp),
           updatedTimestamp: nonZeroOrNull(grant?.updatedTimestamp),
@@ -137,6 +139,8 @@ export class ProjectWithRelationsEntity {
         project?.grants?.map(grant => ({
           ...grant,
           //TODO: remove this once we have a better way to handle this
+          tokenAmount: nonZeroOrNull(grant?.tokenAmount),
+          tokenUnit: notStringOrNull(grant?.tokenUnit),
           programName: notStringOrNull(grant?.programName) ?? "N/A",
           createdTimestamp: nonZeroOrNull(grant?.createdTimestamp),
           updatedTimestamp: nonZeroOrNull(grant?.updatedTimestamp),

src/shared/entities/project.entity.ts

@@ -524,23 +524,23 @@ export class GrantListResult {
 export class GrantFunding {
   public static readonly GrantFundingType = t.strict({
     id: t.string,
-    tokenAmount: t.number,
-    tokenUnit: t.string,
+    tokenAmount: t.union([t.number, t.null]),
+    tokenUnit: t.union([t.string, t.null]),
     fundingDate: t.union([t.number, t.null]),
     amount: t.union([t.number, t.null]),
-    programName: t.string,
-    createdTimestamp: t.number,
+    programName: t.union([t.string, t.null]),
+    createdTimestamp: t.union([t.number, t.null]),
     updatedTimestamp: t.union([t.number, t.null]),
   });
 
   @ApiProperty()
   id: string;
 
   @ApiProperty()
-  tokenAmount: number;
+  tokenAmount: number | null;
 
   @ApiProperty()
-  tokenUnit: string;
+  tokenUnit: string | null;
 
   @ApiProperty()
   fundingDate: number | null;
@@ -549,10 +549,10 @@ export class GrantFunding {
   amount: number | null;
 
   @ApiProperty()
-  programName: string;
+  programName: string | null;
 
   @ApiProperty()
-  createdTimestamp: number;
+  createdTimestamp: number | null;
 
   @ApiProperty()
   updatedTimestamp: number | null;

src/shared/interfaces/grant.interface.ts

@@ -121,7 +121,7 @@ export class OrganizationWithRelations extends Organization {
       investors: t.array(Investor.InvestorType),
       community: t.array(t.string),
       ecosystems: t.array(t.string),
-      grants: t.array(t.string),
+      grants: t.array(GrantFunding.GrantFundingType),
       reviews: t.array(OrgReview.OrgReviewType),
     }),
   ]);