Do not remove special characters in Drop search query and drop_image …

…possibly null (#133)

* testing do not remove special chars

* Remove removeSepecialCharacters

* Bump version

* handle drop_image null

packages/drops/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@poap-xyz/drops",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "Drops module for the poap.js library",
   "main": "dist/cjs/index.cjs",
   "module": "dist/esm/index.mjs",
@@ -29,7 +29,7 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@poap-xyz/providers": "0.5.4",
-    "@poap-xyz/utils": "0.5.4"
+    "@poap-xyz/providers": "0.5.5",
+    "@poap-xyz/utils": "0.5.5"
   }
 }

packages/drops/src/DropsClient.ts

@@ -1,15 +1,14 @@
 import { CompassProvider, DropApiProvider } from '@poap-xyz/providers';
 import {
-  PaginatedResult,
-  nextCursor,
   createBetweenFilter,
-  createInFilter,
-  Order,
-  isNumeric,
-  removeSpecialCharacters,
-  createOrderBy,
   createBoolFilter,
+  createInFilter,
   createLikeFilter,
+  createOrderBy,
+  isNumeric,
+  nextCursor,
+  Order,
+  PaginatedResult,
   toPOAPDate,
 } from '@poap-xyz/utils';
 import { Drop } from './domain/Drop';
@@ -116,7 +115,7 @@ export class DropsClient {
       offset,
       ...(isNumeric(search) && { orderBy: { id: Order.ASC } }),
       args: {
-        search: removeSpecialCharacters(search),
+        search,
       },
     };
 

packages/drops/src/domain/Drop.ts

@@ -27,17 +27,7 @@ export class Drop {
   emailReservationCount: number;
 
   public static fromCompass(response: DropResponse): Drop {
-    const images: { crop: string; original: string } =
-      response.drop_image.gateways.reduce(
-        (images, gateway) => ({
-          ...images,
-          [gateway.type.toLowerCase()]: gateway.url,
-        }),
-        {
-          crop: response.image_url,
-          original: response.image_url,
-        },
-      );
+    const images = Drop.getDropImageFromCompass(response);
 
     return new Drop({
       id: Number(response.id),
@@ -70,6 +60,26 @@ export class Drop {
     });
   }
 
+  private static getDropImageFromCompass(response: DropResponse): {
+    crop: string;
+    original: string;
+  } {
+    const defaultImage = {
+      crop: response.image_url,
+      original: response.image_url,
+    };
+
+    return (
+      response.drop_image?.gateways.reduce(
+        (images, gateway) => ({
+          ...images,
+          [gateway.type.toLowerCase()]: gateway.url,
+        }),
+        defaultImage,
+      ) || defaultImage
+    );
+  }
+
   public static fromProvider(response: ProviderDropResponse): Drop {
     return new Drop({
       id: response.id,

packages/drops/src/types/DropResponse.ts

@@ -34,5 +34,5 @@ export interface DropResponse {
       type: 'CROP' | 'ORIGINAL';
       url: string;
     }>;
-  };
+  } | null;
 }

packages/moments/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@poap-xyz/moments",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "Moments module for the poap.js library",
   "main": "dist/cjs/index.cjs",
   "module": "dist/esm/index.mjs",
@@ -26,8 +26,8 @@
     "build": "rollup -c --bundleConfigAsCjs"
   },
   "dependencies": {
-    "@poap-xyz/providers": "0.5.4",
-    "@poap-xyz/utils": "0.5.4",
+    "@poap-xyz/providers": "0.5.5",
+    "@poap-xyz/utils": "0.5.5",
     "uuid": "^9.0.0"
   },
   "engines": {

packages/poaps/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@poap-xyz/poaps",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "Poaps module for the poap.js library",
   "main": "dist/cjs/index.cjs",
   "module": "dist/esm/index.mjs",
@@ -26,8 +26,8 @@
     "build": "rollup -c --bundleConfigAsCjs"
   },
   "dependencies": {
-    "@poap-xyz/providers": "0.5.4",
-    "@poap-xyz/utils": "0.5.4"
+    "@poap-xyz/providers": "0.5.5",
+    "@poap-xyz/utils": "0.5.5"
   },
   "engines": {
     "node": ">=18"

packages/providers/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@poap-xyz/providers",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "Providers module for the poap.js library",
   "main": "dist/cjs/index.cjs",
   "module": "dist/esm/index.mjs",
@@ -26,7 +26,7 @@
     "build": "rollup -c --bundleConfigAsCjs"
   },
   "dependencies": {
-    "@poap-xyz/utils": "0.5.4",
+    "@poap-xyz/utils": "0.5.5",
     "axios": "^1.6.8",
     "lodash.chunk": "^4.2.0"
   },

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@poap-xyz/utils",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "Utils module for the poap.js library",
   "main": "dist/cjs/index.cjs",
   "module": "dist/esm/index.mjs",

packages/utils/src/format/index.ts

@@ -1,2 +1 @@
-export * from './removeSpecialCharacters';
 export * from './toPOAPDate';

yarn.lock

@@ -884,8 +884,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@poap-xyz/drops@workspace:packages/drops"
   dependencies:
-    "@poap-xyz/providers": 0.5.4
-    "@poap-xyz/utils": 0.5.4
+    "@poap-xyz/providers": 0.5.5
+    "@poap-xyz/utils": 0.5.5
   languageName: unknown
   linkType: soft
 
@@ -901,8 +901,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@poap-xyz/moments@workspace:packages/moments"
   dependencies:
-    "@poap-xyz/providers": 0.5.4
-    "@poap-xyz/utils": 0.5.4
+    "@poap-xyz/providers": 0.5.5
+    "@poap-xyz/utils": 0.5.5
     "@types/uuid": ^9.0.2
     uuid: ^9.0.0
   languageName: unknown
@@ -912,24 +912,24 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@poap-xyz/poaps@workspace:packages/poaps"
   dependencies:
-    "@poap-xyz/providers": 0.5.4
-    "@poap-xyz/utils": 0.5.4
+    "@poap-xyz/providers": 0.5.5
+    "@poap-xyz/utils": 0.5.5
   languageName: unknown
   linkType: soft
 
-"@poap-xyz/[email protected].4, @poap-xyz/providers@workspace:packages/providers":
+"@poap-xyz/[email protected].5, @poap-xyz/providers@workspace:packages/providers":
   version: 0.0.0-use.local
   resolution: "@poap-xyz/providers@workspace:packages/providers"
   dependencies:
-    "@poap-xyz/utils": 0.5.4
+    "@poap-xyz/utils": 0.5.5
     axios: ^1.6.8
     axios-mock-adapter: ^1.21.4
     jest-fetch-mock: ^3.0.3
     lodash.chunk: ^4.2.0
   languageName: unknown
   linkType: soft
 
-"@poap-xyz/[email protected].4, @poap-xyz/utils@workspace:packages/utils":
+"@poap-xyz/[email protected].5, @poap-xyz/utils@workspace:packages/utils":
   version: 0.0.0-use.local
   resolution: "@poap-xyz/utils@workspace:packages/utils"
   languageName: unknown