diff --git a/src/mongoModelsRepo/createPersona.ts b/src/mongoModelsRepo/createPersona.ts index c5d7e0339..3c2b4233a 100644 --- a/src/mongoModelsRepo/createPersona.ts +++ b/src/mongoModelsRepo/createPersona.ts @@ -8,20 +8,18 @@ import { PERSONAS_COLLECTION } from './utils/constants/collections'; export default (config: Config) => { return async (opts: CreatePersonaOptions): Promise => { const collection = (await config.db).collection(PERSONAS_COLLECTION); - const personaId = new ObjectID(); // Docs: http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html#insertOne // Docs: http://bit.ly/insertOneWriteOpResult const opResult = await collection.insertOne({ - _id: personaId, - name: Boolean(opts.name) ? opts.name : personaId.toString(), + name: opts.name, organisation: new ObjectID(opts.organisation), }, {}); // Formats the persona to be returned. const persona: Persona = { id: opResult.insertedId.toString(), - name: Boolean(opts.name) ? opts.name : personaId.toString(), + name: opts.name, organisation: opts.organisation, }; diff --git a/src/tests/createPersona/createPersona.test.ts b/src/tests/createPersona/createPersona.test.ts index 6ca0daf57..0915a6da8 100644 --- a/src/tests/createPersona/createPersona.test.ts +++ b/src/tests/createPersona/createPersona.test.ts @@ -1,11 +1,9 @@ import * as assert from 'assert'; import createTestPersona from '../utils/createTestPersona'; -import createTestPersonaWithoutName from '../utils/createTestPersonaWithoutName'; import setup from '../utils/setup'; import { TEST_ORGANISATION } from '../utils/values'; describe('createPersona', () => { - const service = setup(); it('Should create persona', async () => { @@ -19,16 +17,4 @@ describe('createPersona', () => { assert.equal(actualPersona.name, 'Dave'); assert.equal(actualPersona.organisation, TEST_ORGANISATION); }); - - it('Should create a persona with personaId instead name, if name not exists.', async () => { - const persona = await createTestPersonaWithoutName(); - const {persona: actualPersona} = await service.getPersona({ - organisation: TEST_ORGANISATION, - personaId: persona.id, - }); - - assert.equal(actualPersona.id, persona.id); - assert.equal(actualPersona.name, persona.id.toString()); - assert.equal(actualPersona.organisation, TEST_ORGANISATION); - }); }); diff --git a/src/tests/utils/createTestPersonaWithoutName.ts b/src/tests/utils/createTestPersonaWithoutName.ts deleted file mode 100644 index 5c2616b2a..000000000 --- a/src/tests/utils/createTestPersonaWithoutName.ts +++ /dev/null @@ -1,11 +0,0 @@ -// tslint:disable-next-line:no-unused -import PersonaModel from '../../models/Persona'; -import service from '../../tester'; -import { TEST_ORGANISATION } from './values'; - -export default async (organisation: string = TEST_ORGANISATION) => { - const {persona} = await service.createPersona({ - organisation, - }); - return persona; -};