Merge pull request #12 from launchql/fix/attchment-in-types

fixed the logic in attachment in types

Author: Zetazzz

packages/data-types/types/__tests__/domains.pgutils.test.ts

@@ -44,11 +44,22 @@ const invalidUrls = [
 ];
 
 const validAttachments = [
+  'http://www.foo.bar/some.jpg',
+  'https://foo.bar/some.PNG'
+];
+
+const invalidAttachments = [
+  'hi there',
+  'ftp://foo.bar/some.png',
+  'https:///foo.bar/some.png'
+];
+
+const validImages = [
   { url: 'http://www.foo.bar/some.jpg', mime: 'image/jpg' },
   { url: 'https://foo.bar/some.PNG', mime: 'image/jpg' }
 ];
 
-const invalidAttachments = [
+const invalidImages = [
   { url: 'hi there' },
   { url: 'https://foo.bar/some.png' }
 ];
@@ -87,24 +98,30 @@ afterAll(async () => {
 
 describe('types', () => {
   it('valid attachment and image', async () => {
-    for (const value of validAttachments) {
-      await pg.any(`INSERT INTO customers (image) VALUES ($1::json);`, [value]);
-      await pg.any(`INSERT INTO customers (attachment) VALUES ($1::json);`, [value]);
+    for (const attachment of validAttachments) {
+      await pg.any(`INSERT INTO customers (attachment) VALUES ($1);`, [attachment]);
+    }
+
+    for (const image of validImages) {
+      await pg.any(`INSERT INTO customers (image) VALUES ($1::json);`, [image]);
     }
   });
 
   it('invalid attachment and image', async () => {
-    for (const value of invalidAttachments) {
+    for (const attachment of invalidAttachments) {
       let failed = false;
       try {
-        await pg.any(`INSERT INTO customers (attachment) VALUES ($1);`, [value]);
+        await pg.any(`INSERT INTO customers (attachment) VALUES ($1);`, [attachment]);
       } catch (e) {
         failed = true;
       }
       expect(failed).toBe(true);
-      failed = false;
+    }
+
+    for (const image of invalidImages) {
+      let failed = false;
       try {
-        await pg.any(`INSERT INTO customers (image) VALUES ($1);`, [value]);
+        await pg.any(`INSERT INTO customers (image) VALUES ($1::json);`, [image]);
       } catch (e) {
         failed = true;
       }

packages/data-types/types/__tests__/domains.test.ts

@@ -44,11 +44,22 @@ const invalidUrls = [
 ];
 
 const validAttachments = [
+  'http://www.foo.bar/some.jpg',
+  'https://foo.bar/some.PNG'
+];
+
+const invalidAttachments = [
+  'hi there',
+  'ftp://foo.bar/some.png',
+  'https:///foo.bar/some.png'
+];
+
+const validImages = [
   { url: 'http://www.foo.bar/some.jpg', mime: 'image/jpg' },
   { url: 'https://foo.bar/some.PNG', mime: 'image/jpg' }
 ];
 
-const invalidAttachments = [
+const invalidImages = [
   { url: 'hi there' },
   { url: 'https://foo.bar/some.png' }
 ];
@@ -87,24 +98,30 @@ afterAll(async () => {
 
 describe('types', () => {
   it('valid attachment and image', async () => {
-    for (const value of validAttachments) {
-      await pg.any(`INSERT INTO customers (image) VALUES ($1::json);`, [value]);
-      await pg.any(`INSERT INTO customers (attachment) VALUES ($1::json);`, [value]);
+    for (const attachment of validAttachments) {
+      await pg.any(`INSERT INTO customers (attachment) VALUES ($1);`, [attachment]);
+    }
+
+    for (const image of validImages) {
+      await pg.any(`INSERT INTO customers (image) VALUES ($1::json);`, [image]);
     }
   });
 
   it('invalid attachment and image', async () => {
-    for (const value of invalidAttachments) {
+    for (const attachment of invalidAttachments) {
       let failed = false;
       try {
-        await pg.any(`INSERT INTO customers (attachment) VALUES ($1);`, [value]);
+        await pg.any(`INSERT INTO customers (attachment) VALUES ($1);`, [attachment]);
       } catch (e) {
         failed = true;
       }
       expect(failed).toBe(true);
-      failed = false;
+    }
+
+    for (const image of invalidImages) {
+      let failed = false;
       try {
-        await pg.any(`INSERT INTO customers (image) VALUES ($1);`, [value]);
+        await pg.any(`INSERT INTO customers (image) VALUES ($1::json);`, [image]);
       } catch (e) {
         failed = true;
       }

packages/data-types/types/deploy/schemas/public/domains/attachment.sql

@@ -2,16 +2,6 @@
 -- requires: schemas/public/schema
 
 BEGIN;
-CREATE DOMAIN attachment AS jsonb CHECK (
-  (
-    jsonb_typeof(VALUE) = 'object'
-    AND VALUE ?& ARRAY['url', 'mime']
-    AND VALUE->>'url' ~ '^(https?)://[^\s/$.?#].[^\s]*$'
-  )
-  OR (
-    jsonb_typeof(VALUE) = 'string'
-    AND VALUE #>> '{}' ~ '^(https?)://[^\s/$.?#].[^\s]*$'
-  )
-);
+CREATE DOMAIN attachment AS text CHECK (VALUE ~ '^(https?)://[^\s/$.?#].[^\s]*$');
 COMMENT ON DOMAIN attachment IS E'@name launchqlInternalTypeAttachment';
 COMMIT;

packages/utils/faker/deploy/schemas/faker/procedures/utils.sql

@@ -724,15 +724,11 @@ $$
 LANGUAGE 'plpgsql' VOLATILE;
 
 CREATE FUNCTION faker.attachment(mime text default null) returns attachment as $$
-DECLARE
-  obj jsonb = '{}'::jsonb;
 BEGIN
   IF (mime IS NULL) THEN
     mime = faker.mime();
   END IF;
-  obj = jsonb_set(obj, '{url}', to_jsonb(faker.url(mime)::text));
-  obj = jsonb_set(obj, '{mime}', to_jsonb(mime));
-  RETURN obj;
+  RETURN faker.url(mime);
 END;
 $$
 LANGUAGE 'plpgsql' VOLATILE;

packages/utils/faker/sql/launchql-faker--0.9.0.sql

@@ -677,15 +677,11 @@ END;
 $EOFCODE$ LANGUAGE plpgsql VOLATILE;
 
 CREATE FUNCTION faker.attachment(mime text DEFAULT NULL) RETURNS attachment AS $EOFCODE$
-DECLARE
-  obj jsonb = '{}'::jsonb;
 BEGIN
   IF (mime IS NULL) THEN
     mime = faker.mime();
   END IF;
-  obj = jsonb_set(obj, '{url}', to_jsonb(faker.url(mime)::text));
-  obj = jsonb_set(obj, '{mime}', to_jsonb(mime));
-  RETURN obj;
+  RETURN faker.url(mime);
 END;
 $EOFCODE$ LANGUAGE plpgsql VOLATILE;
 
@@ -10405,4 +10401,4 @@ INSERT INTO faker.dictionary (
   ('cta', 'Learn more'),
   ('cta', 'Join now'),
   ('cta', 'Start now'),
-  ('cta', 'Get yours now');
+  ('cta', 'Get yours now');