api: update tests

KlimaDAO · Nov 30, 2023 · bbd7e0b · bbd7e0b
1 parent 3aac5fe
commit bbd7e0b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 35 deletions.
diff --git a/carbonmark-api/src/routes/users/get.ts b/carbonmark-api/src/routes/users/get.ts
@@ -93,7 +93,7 @@ const handler = (fastify: FastifyInstance) =>
 
       const listings = user?.listings?.map(formatListing) || [];
 
-      const response = {
+      const response: User = {
         createdAt: profile?.createdAt || 0,
         description: profile?.description || "", // TODO extract to nullable `profile` property.
         handle: profile?.handle || "",

diff --git a/carbonmark-api/src/utils/helpers/users.utils.ts b/carbonmark-api/src/utils/helpers/users.utils.ts
@@ -1,9 +1,5 @@
 import { app } from "firebase-admin";
 import { chunk } from "lodash";
-import { Activity } from "../../models/Activity.model";
-import { Asset } from "../../models/Asset.model";
-import { Listing } from "../../models/Listing.model";
-import { User } from "../../models/User.model";
 
 export interface UserProfile {
   address: string;
@@ -91,21 +87,3 @@ const formatProfile = (profile: UserProfile): UserProfile => {
     updatedAt: Math.floor(profile.updatedAt / 1000),
   };
 };
-
-export const userFromProfile = (
-  profile: UserProfile,
-  props: { listings: Listing[]; activities: Activity[]; assets: Asset[] }
-): User => {
-  return {
-    createdAt: profile?.createdAt || 0,
-    description: profile?.description || "", // TODO extract to nullable `profile` property.
-    handle: profile?.handle || "",
-    profileImgUrl: profile?.profileImgUrl || null,
-    updatedAt: profile?.updatedAt || 0,
-    username: profile?.username || "",
-    wallet: profile.address,
-    listings: props.listings,
-    activities: props.activities,
-    assets: props.assets,
-  };
-};
diff --git a/carbonmark-api/test/fixtures/marketplace.ts b/carbonmark-api/test/fixtures/marketplace.ts
@@ -10,6 +10,7 @@ const listing = aListing({
   totalAmountToSell: "100000000000000000000",
   leftToSell: "100000000000000000000",
   updatedAt: "1234",
+  createdAt: "1234",
 });
 
 const projectWithListing = aProject({

diff --git a/carbonmark-api/test/routes/projects/get.test.ts b/carbonmark-api/test/routes/projects/get.test.ts
@@ -187,16 +187,18 @@ describe("GET /projects", () => {
         price: "99",
         updatedAt: marketplace.projectWithListing.listings?.[0].updatedAt,
         listings: [
-          pick(marketplace.projectWithListing.listings![0], [
-            "active",
-            "batchPrices",
-            "batches",
-            "createdAt",
-            "deleted",
-            "updatedAt",
-            "id",
-            "tokenAddress",
-          ]),
+          {
+            ...pick(marketplace.projectWithListing.listings![0], [
+              "active",
+              "batchPrices",
+              "batches",
+              "deleted",
+              "id",
+              "tokenAddress",
+            ]),
+            createdAt: 1234,
+            updatedAt: 1234,
+          },
         ],
         location: {
           geometry: {

diff --git a/carbonmark-api/test/test.constants.ts b/carbonmark-api/test/test.constants.ts
@@ -46,8 +46,8 @@ export const MOCK_USER_PROFILE: UserProfile = {
 
 export const EXPECTED_USER_RESPONSE = {
   ...omit(MOCK_USER_PROFILE, ["address", "updatedAt", "createdAt"]),
-  updatedAt: "1699715108",
-  createdAt: "0",
+  updatedAt: 1699715108,
+  createdAt: 0,
   wallet: MOCK_USER_PROFILE.address,
   listings: [],
   activities: [],