Update master branch with v1.10

__tests__/wallet-get.spec.js

@@ -53,7 +53,13 @@ describe('Wallet: Get wallets of an account', () => {
       await walletService.createWallet(seed.wallet.id, `test${i}`);
     }
 
-    const res = await walletService.getAllWallets(seed.wallet.id);
+    const res = await walletService.getAllWallets(
+      seed.wallet.id,
+      undefined,
+      undefined,
+      'created_at',
+      'desc',
+    );
     expect(res.count).to.eq(11);
   });
 

database/migrations/20200917183542-CreateTableWallet.js

@@ -1,20 +1,18 @@
-
-
 let dbm;
 let type;
 let seed;
 
 /**
-  * We receive the dbmigrate dependency from dbmigrate initially.
-  * This enables us to not have to rely on NODE_PATH.
-  */
-exports.setup = function(options, seedLink) {
+ * We receive the dbmigrate dependency from dbmigrate initially.
+ * This enables us to not have to rely on NODE_PATH.
+ */
+exports.setup = function (options, seedLink) {
   dbm = options.dbmigrate;
   type = dbm.dataType;
   seed = seedLink;
 };
 
-exports.up = function(db) {
+exports.up = function (db) {
   return db.createTable('wallet', {
     id: { type: 'uuid', primaryKey: true, notNull: true },
     name: { type: 'string', notNull: true },
@@ -24,10 +22,10 @@ exports.up = function(db) {
   });
 };
 
-exports.down = function(db) {
+exports.down = function (db) {
   return db.dropTable('wallet');
 };
 
 exports._meta = {
-  "version": 1
+  version: 1,
 };

database/migrations/20230314184543-add-batch-create-check.js

@@ -0,0 +1,59 @@
+'use strict';
+
+var dbm;
+var type;
+var seed;
+var fs = require('fs');
+var path = require('path');
+var Promise;
+
+/**
+ * We receive the dbmigrate dependency from dbmigrate initially.
+ * This enables us to not have to rely on NODE_PATH.
+ */
+exports.setup = function (options, seedLink) {
+  dbm = options.dbmigrate;
+  type = dbm.dataType;
+  seed = seedLink;
+  Promise = options.Promise;
+};
+
+exports.up = function (db) {
+  var filePath = path.join(
+    __dirname,
+    'sqls',
+    '20230314184543-add-batch-create-check-up.sql',
+  );
+  return new Promise(function (resolve, reject) {
+    fs.readFile(filePath, { encoding: 'utf-8' }, function (err, data) {
+      if (err) return reject(err);
+      console.log('received data: ' + data);
+
+      resolve(data);
+    });
+  }).then(function (data) {
+    return db.runSql(data);
+  });
+};
+
+exports.down = function (db) {
+  var filePath = path.join(
+    __dirname,
+    'sqls',
+    '20230314184543-add-batch-create-check-down.sql',
+  );
+  return new Promise(function (resolve, reject) {
+    fs.readFile(filePath, { encoding: 'utf-8' }, function (err, data) {
+      if (err) return reject(err);
+      console.log('received data: ' + data);
+
+      resolve(data);
+    });
+  }).then(function (data) {
+    return db.runSql(data);
+  });
+};
+
+exports._meta = {
+  version: 1,
+};

database/migrations/20230529135030-add-about.js

@@ -0,0 +1,59 @@
+'use strict';
+
+var dbm;
+var type;
+var seed;
+var fs = require('fs');
+var path = require('path');
+var Promise;
+
+/**
+ * We receive the dbmigrate dependency from dbmigrate initially.
+ * This enables us to not have to rely on NODE_PATH.
+ */
+exports.setup = function (options, seedLink) {
+  dbm = options.dbmigrate;
+  type = dbm.dataType;
+  seed = seedLink;
+  Promise = options.Promise;
+};
+
+exports.up = function (db) {
+  var filePath = path.join(
+    __dirname,
+    'sqls',
+    '20230529135030-add-about-up.sql',
+  );
+  return new Promise(function (resolve, reject) {
+    fs.readFile(filePath, { encoding: 'utf-8' }, function (err, data) {
+      if (err) return reject(err);
+      console.log('received data: ' + data);
+
+      resolve(data);
+    });
+  }).then(function (data) {
+    return db.runSql(data);
+  });
+};
+
+exports.down = function (db) {
+  var filePath = path.join(
+    __dirname,
+    'sqls',
+    '20230529135030-add-about-down.sql',
+  );
+  return new Promise(function (resolve, reject) {
+    fs.readFile(filePath, { encoding: 'utf-8' }, function (err, data) {
+      if (err) return reject(err);
+      console.log('received data: ' + data);
+
+      resolve(data);
+    });
+  }).then(function (data) {
+    return db.runSql(data);
+  });
+};
+
+exports._meta = {
+  version: 1,
+};

database/migrations/sqls/20230314184543-add-batch-create-check-down.sql

@@ -0,0 +1 @@
+ALTER TABLE api_key DROP COLUMN batch_create_access;

database/migrations/sqls/20230314184543-add-batch-create-check-up.sql

@@ -0,0 +1 @@
+ALTER TABLE api_key ADD COLUMN batch_create_access BOOLEAN DEFAULT false;

database/migrations/sqls/20230529135030-add-about-down.sql

@@ -0,0 +1 @@
+ALTER TABLE wallet DROP COLUMN about;

database/migrations/sqls/20230529135030-add-about-up.sql

@@ -0,0 +1 @@
+ALTER TABLE wallet ADD COLUMN about varchar;

deployment/base/treetracker-wallet-api-mapping.yaml

@@ -6,4 +6,4 @@ spec:
   prefix: /wallet/v2/
   service: treetracker-wallet-api-v2
   rewrite: /
-  timeout_ms: 0
+  timeout_ms: 10000