@pgpm/achievements 0.15.3 → 0.15.4

package/Makefile

@@ -1,5 +1,5 @@
 EXTENSION = pgpm-achievements
-DATA = sql/pgpm-achievements--0.15.2.sql
+DATA = sql/pgpm-achievements--0.15.3.sql
 
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpm/achievements",
-  "version": "0.15.3",
+  "version": "0.15.4",
   "description": "Achievement system for tracking user progress and milestones",
   "author": "Dan Lynch <pyramation@gmail.com>",
   "contributors": [
@@ -21,11 +21,11 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@pgpm/jwt-claims": "0.15.3",
-    "@pgpm/verify": "0.15.3"
+    "@pgpm/jwt-claims": "0.15.4",
+    "@pgpm/verify": "0.15.4"
   },
   "devDependencies": {
-    "pgpm": "^1.0.0"
+    "pgpm": "^1.2.2"
   },
   "repository": {
     "type": "git",
@@ -35,5 +35,5 @@
   "bugs": {
     "url": "https://github.com/constructive-io/pgpm-modules/issues"
   },
-  "gitHead": "187ed37f6b731132fe930acf5b5996b1e63ecca0"
+  "gitHead": "aad0dbef0336d6c18d027120ef9addc418822edd"
 }

package/pgpm-achievements.control

@@ -1,6 +1,6 @@
 # pgpm-achievements extension
 comment = 'pgpm-achievements extension'
-default_version = '0.15.2'
+default_version = '0.15.3'
 module_pathname = '$libdir/pgpm-achievements'
 requires = 'plpgsql,uuid-ossp,pgpm-jwt-claims,pgpm-verify'
 relocatable = false

package/__tests__/__snapshots__/achievements.test.ts.snap

@@ -1,180 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`advanced 1`] = `
-{
-  "advancedRequirements": [
-    {
-      "id": "[ID]",
-      "level": "advanced",
-      "name": "invite_users",
-      "priority": 100,
-      "required_count": 12,
-    },
-  ],
-}
-`;
-
-exports[`advanced 2`] = `
-{
-  "newbieRequirements": [],
-}
-`;
-
-exports[`advanced 3`] = `
-{
-  "newbie": {
-    "user_achieved": true,
-  },
-}
-`;
-
-exports[`advanced 4`] = `
-{
-  "advanced": {
-    "user_achieved": false,
-  },
-}
-`;
-
-exports[`advanced part II 1`] = `
-{
-  "advancedRequirements": [
-    {
-      "id": "[ID]",
-      "level": "advanced",
-      "name": "invite_users",
-      "priority": 100,
-      "required_count": 12,
-    },
-    {
-      "id": "[ID]",
-      "level": "advanced",
-      "name": "complete_action",
-      "priority": 100,
-      "required_count": 5,
-    },
-    {
-      "id": "[ID]",
-      "level": "advanced",
-      "name": "apply_for_verifier",
-      "priority": 100,
-      "required_count": 1,
-    },
-    {
-      "id": "[ID]",
-      "level": "advanced",
-      "name": "create_action",
-      "priority": 100,
-      "required_count": 2,
-    },
-  ],
-}
-`;
-
-exports[`advanced part II 2`] = `
-{
-  "newbieRequirements": [],
-}
-`;
-
-exports[`advanced part II 3`] = `
-{
-  "newbie": {
-    "user_achieved": true,
-  },
-}
-`;
-
-exports[`advanced part II 4`] = `
-{
-  "advanced": {
-    "user_achieved": false,
-  },
-}
-`;
-
-exports[`advanced part III 1`] = `
-{
-  "advancedRequirements": [],
-}
-`;
-
-exports[`advanced part III 2`] = `
-{
-  "newbieRequirements": [],
-}
-`;
-
-exports[`advanced part III 3`] = `
-{
-  "newbie": {
-    "user_achieved": true,
-  },
-}
-`;
-
-exports[`advanced part III 4`] = `
-{
-  "advanced": {
-    "user_achieved": true,
-  },
-}
-`;
-
-exports[`newbie 1`] = `
-{
-  "advancedRequirements": [
-    {
-      "id": "[ID]",
-      "level": "advanced",
-      "name": "invite_users",
-      "priority": 100,
-      "required_count": 15,
-    },
-    {
-      "id": "[ID]",
-      "level": "advanced",
-      "name": "complete_action",
-      "priority": 100,
-      "required_count": 12,
-    },
-  ],
-}
-`;
-
-exports[`newbie 2`] = `
-{
-  "newbieRequirements": [
-    {
-      "id": "[ID]",
-      "level": "newbie",
-      "name": "upload_profile_image",
-      "priority": 100,
-      "required_count": 1,
-    },
-    {
-      "id": "[ID]",
-      "level": "newbie",
-      "name": "complete_action",
-      "priority": 100,
-      "required_count": 2,
-    },
-  ],
-}
-`;
-
-exports[`newbie 3`] = `
-{
-  "newbie": {
-    "user_achieved": false,
-  },
-}
-`;
-
-exports[`newbie 4`] = `
-{
-  "advanced": {
-    "user_achieved": false,
-  },
-}
-`;

package/__tests__/__snapshots__/triggers.test.ts.snap

@@ -1,112 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`newbie 1`] = `
-{
-  "beforeInsert": [],
-}
-`;
-
-exports[`newbie 2`] = `
-{
-  "afterFirstInsert": [
-    {
-      "count": 1,
-      "created_at": "[DATE]",
-      "id": "[ID]",
-      "name": "tg_achievement",
-      "user_id": "[ID]",
-    },
-  ],
-}
-`;
-
-exports[`newbie 3`] = `
-{
-  "afterUpdateToggleToValue": [
-    {
-      "count": 1,
-      "created_at": "[DATE]",
-      "id": "[ID]",
-      "name": "tg_achievement",
-      "user_id": "[ID]",
-    },
-    {
-      "count": 1,
-      "created_at": "[DATE]",
-      "id": "[ID]",
-      "name": "tg_achievement_toggle",
-      "user_id": "[ID]",
-    },
-  ],
-}
-`;
-
-exports[`newbie 4`] = `
-{
-  "afterUpdateToggleToNull": [
-    {
-      "count": 1,
-      "created_at": "[DATE]",
-      "id": "[ID]",
-      "name": "tg_achievement",
-      "user_id": "[ID]",
-    },
-  ],
-}
-`;
-
-exports[`newbie 5`] = `
-{
-  "afterIsVerifiedIsTrue": [
-    {
-      "count": 1,
-      "created_at": "[DATE]",
-      "id": "[ID]",
-      "name": "tg_achievement",
-      "user_id": "[ID]",
-    },
-    {
-      "count": 1,
-      "created_at": "[DATE]",
-      "id": "[ID]",
-      "name": "tg_achievement_toggle_boolean",
-      "user_id": "[ID]",
-    },
-  ],
-}
-`;
-
-exports[`newbie 6`] = `
-{
-  "afterIsVerifiedIsFalse": [
-    {
-      "count": 1,
-      "created_at": "[DATE]",
-      "id": "[ID]",
-      "name": "tg_achievement",
-      "user_id": "[ID]",
-    },
-  ],
-}
-`;
-
-exports[`newbie 7`] = `
-{
-  "afterIsApprovedTrue": [
-    {
-      "count": 1,
-      "created_at": "[DATE]",
-      "id": "[ID]",
-      "name": "tg_achievement",
-      "user_id": "[ID]",
-    },
-    {
-      "count": 1,
-      "created_at": "[DATE]",
-      "id": "[ID]",
-      "name": "tg_achievement_boolean",
-      "user_id": "[ID]",
-    },
-  ],
-}
-`;

package/__tests__/achievements.test.ts

@@ -1,249 +0,0 @@
-import { getConnections, PgTestClient, snapshot } from 'pgsql-test';
-
-let pg: PgTestClient;
-let teardown:  () => Promise<void>;
-
-const user_id = 'b9d22af1-62c7-43a5-b8c4-50630bbd4962';
-
-const repeat = (str: string, n: number): string[] =>
-  Array.from({ length: n }).map(() => str);
-
-const levels = ['newbie', 'advanced'];
-
-const newbie = [
-  ['upload_profile_image'],
-  ['complete_action', 5],
-  ['accept_cookies'],
-  ['accept_privacy'],
-  ['agree_to_terms']
-];
-const advanced = [
-  ['invite_users', 15],
-  ['complete_action', 15]
-];
-
-beforeAll(async () => {
-  ({ pg, teardown } = await getConnections());
-});
-
-afterAll(async () => {
-  await teardown();
-});
-
-beforeEach(async () => {
-  await pg.beforeEach();
-
-  for (const name of levels) {
-    await pg.any(`INSERT INTO status_public.levels (name) VALUES ($1)`, [name]);
-  }
-
-  for (const [name, required_count = 1] of newbie) {
-    await pg.any(
-      `INSERT INTO status_public.level_requirements (name, level, required_count)
-       VALUES ($1, $2, $3)`,
-      [name, 'newbie', required_count]
-    );
-  }
-
-  for (const [name, required_count = 1] of advanced) {
-    await pg.any(
-      `INSERT INTO status_public.level_requirements (name, level, required_count)
-       VALUES ($1, $2, $3)`,
-      [name, 'advanced', required_count]
-    );
-  }
-});
-
-afterEach(async () => {
-  await pg.afterEach();
-});
-
-it('newbie', async () => {
-    const steps = [
-    'agree_to_terms',
-    'accept_cookies',
-    'accept_privacy',
-    ...repeat('complete_action', 3)
-  ];
-  for (const name of steps) {
-    await pg.any(
-      `INSERT INTO status_public.user_steps (user_id, name) VALUES ($1, $2)`,
-      [user_id, name]
-    );
-  }
-
-  const advancedRequirements = await pg.any(
-    `SELECT * FROM status_public.steps_required($1, $2)`,
-    ['advanced', user_id]
-  );
-  expect(snapshot({ advancedRequirements })).toMatchSnapshot();
-
-  const newbieRequirements = await pg.any(
-    `SELECT * FROM status_public.steps_required($1, $2)`,
-    ['newbie', user_id]
-  );
-  expect(snapshot({ newbieRequirements })).toMatchSnapshot();
-
-  const [userAchievedNewbie] = await pg.any(
-    `SELECT * FROM status_public.user_achieved($1, $2)`,
-    ['newbie', user_id]
-  );
-  expect(snapshot({ newbie: userAchievedNewbie })).toMatchSnapshot();
-
-  const [userAchievedAdvanced] = await pg.any(
-    `SELECT * FROM status_public.user_achieved($1, $2)`,
-    ['advanced', user_id]
-  );
-  expect(snapshot({ advanced: userAchievedAdvanced })).toMatchSnapshot();
-});
-
-it('advanced', async () => {
-    const steps = [
-    'agree_to_terms',
-    'accept_cookies',
-    'accept_privacy',
-    'upload_profile_image',
-    ...repeat('invite_users', 3),
-    ...repeat('complete_action', 21)
-  ];
-  for (const name of steps) {
-    await pg.any(
-      `INSERT INTO status_public.user_steps (user_id, name) VALUES ($1, $2)`,
-      [user_id, name]
-    );
-  }
-
-  const advancedRequirements = await pg.any(
-    `SELECT * FROM status_public.steps_required($1, $2)`,
-    ['advanced', user_id]
-  );
-  expect(snapshot({ advancedRequirements })).toMatchSnapshot();
-
-  const newbieRequirements = await pg.any(
-    `SELECT * FROM status_public.steps_required($1, $2)`,
-    ['newbie', user_id]
-  );
-  expect(snapshot({ newbieRequirements })).toMatchSnapshot();
-
-  const [userAchievedNewbie] = await pg.any(
-    `SELECT * FROM status_public.user_achieved($1, $2)`,
-    ['newbie', user_id]
-  );
-  expect(snapshot({ newbie: userAchievedNewbie })).toMatchSnapshot();
-
-  const [userAchievedAdvanced] = await pg.any(
-    `SELECT * FROM status_public.user_achieved($1, $2)`,
-    ['advanced', user_id]
-  );
-  expect(snapshot({ advanced: userAchievedAdvanced })).toMatchSnapshot();
-});
-
-it('advanced part II', async () => {
-    const partII = [['apply_for_verifier'], ['create_action', 2]];
-
-  for (const [name, required_count = 1] of partII) {
-    await pg.any(
-      `INSERT INTO status_public.level_requirements (name, level, required_count)
-       VALUES ($1, $2, $3)`,
-      [name, 'advanced', required_count]
-    );
-  }
-
-  const steps = [
-    'agree_to_terms',
-    'accept_cookies',
-    'accept_privacy',
-    'upload_profile_image',
-    ...repeat('invite_users', 3),
-    ...repeat('complete_action', 10)
-  ];
-  for (const name of steps) {
-    await pg.any(
-      `INSERT INTO status_public.user_steps (user_id, name) VALUES ($1, $2)`,
-      [user_id, name]
-    );
-  }
-
-  const advancedRequirements = await pg.any(
-    `SELECT * FROM status_public.steps_required($1, $2)`,
-    ['advanced', user_id]
-  );
-  expect(snapshot({ advancedRequirements })).toMatchSnapshot();
-
-  const newbieRequirements = await pg.any(
-    `SELECT * FROM status_public.steps_required($1, $2)`,
-    ['newbie', user_id]
-  );
-  expect(snapshot({ newbieRequirements })).toMatchSnapshot();
-
-  const [userAchievedNewbie] = await pg.any(
-    `SELECT * FROM status_public.user_achieved($1, $2)`,
-    ['newbie', user_id]
-  );
-  expect(snapshot({ newbie: userAchievedNewbie })).toMatchSnapshot();
-
-  const [userAchievedAdvanced] = await pg.any(
-    `SELECT * FROM status_public.user_achieved($1, $2)`,
-    ['advanced', user_id]
-  );
-  expect(snapshot({ advanced: userAchievedAdvanced })).toMatchSnapshot();
-});
-
-it('advanced part III', async () => {
-    const partIII = [
-    ['apply_for_verifier'],
-    ['approved_for_verifier'],
-    ['create_action', 2]
-  ];
-
-  for (const [name, required_count = 1] of partIII) {
-    await pg.any(
-      `INSERT INTO status_public.level_requirements (name, level, required_count)
-       VALUES ($1, $2, $3)`,
-      [name, 'advanced', required_count]
-    );
-  }
-
-  const steps = [
-    'agree_to_terms',
-    'accept_cookies',
-    'accept_privacy',
-    'upload_profile_image',
-    ...repeat('invite_users', 20),
-    ...repeat('complete_action', 20),
-    ...repeat('create_action', 10),
-    ...repeat('apply_for_verifier', 1),
-    ...repeat('approved_for_verifier', 1)
-  ];
-
-  for (const name of steps) {
-    await pg.any(
-      `INSERT INTO status_public.user_steps (user_id, name) VALUES ($1, $2)`,
-      [user_id, name]
-    );
-  }
-
-  const advancedRequirements = await pg.any(
-    `SELECT * FROM status_public.steps_required($1, $2)`,
-    ['advanced', user_id]
-  );
-  expect(snapshot({ advancedRequirements })).toMatchSnapshot();
-
-  const newbieRequirements = await pg.any(
-    `SELECT * FROM status_public.steps_required($1, $2)`,
-    ['newbie', user_id]
-  );
-  expect(snapshot({ newbieRequirements })).toMatchSnapshot();
-
-  const [userAchievedNewbie] = await pg.any(
-    `SELECT * FROM status_public.user_achieved($1, $2)`,
-    ['newbie', user_id]
-  );
-  expect(snapshot({ newbie: userAchievedNewbie })).toMatchSnapshot();
-
-  const [userAchievedAdvanced] = await pg.any(
-    `SELECT * FROM status_public.user_achieved($1, $2)`,
-    ['advanced', user_id]
-  );
-  expect(snapshot({ advanced: userAchievedAdvanced })).toMatchSnapshot();
-});

package/__tests__/triggers.test.ts

@@ -1,166 +0,0 @@
-import { getConnections, PgTestClient, snapshot } from 'pgsql-test';
-
-let pg: PgTestClient;
-let teardown:  () => Promise<void>;
-
-const user_id = 'b9d22af1-62c7-43a5-b8c4-50630bbd4962';
-
-const levels = ['newbie', 'advanced'];
-
-const newbie = [
-  ['upload_profile_image'],
-  ['complete_action', 5],
-  ['accept_cookies'],
-  ['accept_privacy'],
-  ['agree_to_terms']
-];
-const advanced = [
-  ['invite_users', 15],
-  ['complete_action', 15]
-];
-
-beforeAll(async () => {
-  ({ pg, teardown } = await getConnections());
-
-  await pg.any(`CREATE TABLE status_public.mytable (
-    id serial,
-    name text,
-    toggle text,
-    is_approved boolean,
-    is_verified boolean default false
-  );`);
-
-  await pg.any(`CREATE TRIGGER mytable_tg1 
-    BEFORE INSERT ON status_public.mytable 
-    FOR EACH ROW
-    EXECUTE FUNCTION status_private.tg_achievement('name', 'tg_achievement');`);
-
-  await pg.any(`CREATE TRIGGER mytable_tg2
-    BEFORE UPDATE ON status_public.mytable 
-    FOR EACH ROW
-    WHEN (NEW.name IS DISTINCT FROM OLD.name)
-    EXECUTE FUNCTION status_private.tg_achievement('name', 'tg_achievement');`);
-
-  await pg.any(`CREATE TRIGGER mytable_tg3
-    BEFORE INSERT ON status_public.mytable
-    FOR EACH ROW
-    EXECUTE FUNCTION status_private.tg_achievement_toggle('toggle', 'tg_achievement_toggle');`);
-
-  await pg.any(`CREATE TRIGGER mytable_tg4
-    BEFORE UPDATE ON status_public.mytable
-    FOR EACH ROW
-    WHEN (NEW.toggle IS DISTINCT FROM OLD.toggle)
-    EXECUTE FUNCTION status_private.tg_achievement_toggle('toggle', 'tg_achievement_toggle');`);
-
-  await pg.any(`CREATE TRIGGER mytable_tg5
-    BEFORE INSERT ON status_public.mytable
-    FOR EACH ROW
-    EXECUTE FUNCTION status_private.tg_achievement_boolean('is_approved', 'tg_achievement_boolean');`);
-
-  await pg.any(`CREATE TRIGGER mytable_tg6
-    BEFORE UPDATE ON status_public.mytable
-    FOR EACH ROW
-    WHEN (NEW.is_approved IS DISTINCT FROM OLD.is_approved)
-    EXECUTE FUNCTION status_private.tg_achievement_boolean('is_approved', 'tg_achievement_boolean');`);
-
-  await pg.any(`CREATE TRIGGER mytable_tg7
-    BEFORE INSERT ON status_public.mytable
-    FOR EACH ROW
-    EXECUTE FUNCTION status_private.tg_achievement_toggle_boolean('is_verified', 'tg_achievement_toggle_boolean');`);
-
-  await pg.any(`CREATE TRIGGER mytable_tg8
-    BEFORE UPDATE ON status_public.mytable
-    FOR EACH ROW
-    WHEN (NEW.is_verified IS DISTINCT FROM OLD.is_verified)
-    EXECUTE FUNCTION status_private.tg_achievement_toggle_boolean('is_verified', 'tg_achievement_toggle_boolean');`);
-
-  await pg.setContext({
-    'jwt.claims.user_id': user_id
-  });
-});
-
-afterAll(async () => {
-  await teardown();
-});
-
-beforeEach(async () => {
-  await pg.beforeEach();
-
-  for (const name of levels) {
-    await pg.any(
-      `INSERT INTO status_public.levels (name) VALUES ($1) ON CONFLICT DO NOTHING`,
-      [name]
-    );
-  }
-
-  for (const [name, required_count = 1] of newbie) {
-    await pg.any(
-      `INSERT INTO status_public.level_requirements (name, level, required_count)
-       VALUES ($1, $2, $3) ON CONFLICT DO NOTHING`,
-      [name, 'newbie', required_count]
-    );
-  }
-  for (const [name, required_count = 1] of advanced) {
-    await pg.any(
-      `INSERT INTO status_public.level_requirements (name, level, required_count)
-       VALUES ($1, $2, $3) ON CONFLICT DO NOTHING`,
-      [name, 'advanced', required_count]
-    );
-  }
-});
-
-afterEach(async () => {
-  await pg.afterEach();
-});
-
-it('newbie', async () => {
-  const beforeInsert = await pg.any(
-    `SELECT * FROM status_public.user_achievements ORDER BY name`
-  );
-  expect(snapshot({ beforeInsert })).toMatchSnapshot();
-
-  await pg.any(
-    `INSERT INTO status_public.mytable (name) VALUES ($1)`,
-    ['upload_profile_image']
-  );
-
-  const afterFirstInsert = await pg.any(
-    `SELECT * FROM status_public.user_achievements ORDER BY name`
-  );
-  expect(snapshot({ afterFirstInsert })).toMatchSnapshot();
-
-  await pg.any(`UPDATE status_public.mytable SET toggle = 'yo'`);
-
-  const afterUpdateToggleToValue = await pg.any(
-    `SELECT * FROM status_public.user_achievements ORDER BY name`
-  );
-  expect(snapshot({ afterUpdateToggleToValue })).toMatchSnapshot();
-
-  await pg.any(`UPDATE status_public.mytable SET toggle = NULL`);
-
-  const afterUpdateToggleToNull = await pg.any(
-    `SELECT * FROM status_public.user_achievements ORDER BY name`
-  );
-  expect(snapshot({ afterUpdateToggleToNull })).toMatchSnapshot();
-
-  await pg.any(`UPDATE status_public.mytable SET is_verified = TRUE`);
-
-  const afterIsVerifiedIsTrue = await pg.any(
-    `SELECT * FROM status_public.user_achievements ORDER BY name`
-  );
-  expect(snapshot({ afterIsVerifiedIsTrue })).toMatchSnapshot();
-
-  await pg.any(`UPDATE status_public.mytable SET is_verified = FALSE`);
-
-  const afterIsVerifiedIsFalse = await pg.any(
-    `SELECT * FROM status_public.user_achievements ORDER BY name`
-  );
-  expect(snapshot({ afterIsVerifiedIsFalse })).toMatchSnapshot();
-
-  await pg.any(`UPDATE status_public.mytable SET is_approved = TRUE`);
-
-  const afterIsApprovedTrue = await pg.any(
-    `SELECT * FROM status_public.user_achievements ORDER BY name`
-  );
-  expect(snapshot({ afterIsApprovedTrue })).toMatchSnapshot();
-});