Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions schemas/organization.getMetadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
"properties": {
"organizationId": {
"type": "string"
},
"audience": {
Comment thread
jenyapoyarkov marked this conversation as resolved.
"type": "string",
"minLength": 1
}
}
}
4 changes: 4 additions & 0 deletions schemas/organization.updateMetadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
"organizationId": {
"type": "string"
},
"audience": {
"type": "string",
"minLength": 1
},
"metadata": {
"$ref": "common.json#/definitions/metadata"
}
Expand Down
4 changes: 2 additions & 2 deletions src/actions/organization/getMetadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ const { getOrganizationMetadata, checkOrganizationExists } = require('../../util
* @apiSuccess (Response) {Object} data.attributes.metadata - organization metadata
*/
async function organizationMetadata({ params }) {
const { organizationId } = params;
const { organizationId, audience } = params;

const metadata = await getOrganizationMetadata.call(this, organizationId);
const metadata = await getOrganizationMetadata.call(this, organizationId, audience);
return {
data: {
id: organizationId,
Expand Down
8 changes: 4 additions & 4 deletions src/actions/organization/updateMetadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ const { checkOrganizationExists, getOrganizationMetadata } = require('../../util
*/
async function updateOrganizationMetadata({ params }) {
const { config } = this;
const { metadata, organizationId } = params;
const { audience } = config.organizations;
const { metadata, organizationId, audience } = params;
const { audience: defaultAudience } = config.organizations;

if (metadata) {
await setOrganizationMetadata.call(this, {
organizationId,
audience,
audience: audience || defaultAudience,
metadata,
});
}

const data = await getOrganizationMetadata.call(this, organizationId);
const data = await getOrganizationMetadata.call(this, organizationId, audience);
return {
data: {
id: organizationId,
Expand Down
6 changes: 3 additions & 3 deletions src/utils/organization/getOrganizationMetadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ const { ORGANIZATIONS_METADATA } = require('../../constants');
const redisKey = require('../key');
const JSONParse = require('../safeParse');

async function getOrganizationMetadata(organizationId) {
async function getOrganizationMetadata(organizationId, audience) {
const { redis, config } = this;
const { audience } = config.organizations;
const { audience: defaultAudience } = config.organizations;

const metadata = await redis.hgetall(redisKey(organizationId, ORGANIZATIONS_METADATA, audience));
const metadata = await redis.hgetall(redisKey(organizationId, ORGANIZATIONS_METADATA, audience || defaultAudience));
return mapValues(metadata, JSONParse);
}

Expand Down
30 changes: 30 additions & 0 deletions test/suites/organization/updateMetadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,36 @@ describe('#update metadata organization', function registerSuite() {
});
});

it('must be able to update and get custom audience organization metadata', async function test() {
const updatedOpts = {
organizationId: this.organization.id,
audience: 'test-audience',
metadata: {
$set: { address: 'test-audience' },
},
};

await this.dispatch('users.organization.updateMetadata', updatedOpts)
.reflect()
.then(inspectPromise(true))
.then((createdOrganization) => {
assert(createdOrganization.data.attributes.address === 'test-audience');
});

const opts = {
organizationId: this.organization.id,
audience: 'test-audience',
};

return this.dispatch('users.organization.getMetadata', opts)
.reflect()
.then(inspectPromise(true))
.then((response) => {
assert.ok(response.data.attributes);
assert(response.data.attributes.address === 'test-audience');
});
});

it('must return organization not found error', async function test() {
const opts = {
organizationId: '1234',
Expand Down