From 35c4baa117b30319b086b9d1cdc5acd54e5be9c8 Mon Sep 17 00:00:00 2001 From: Akshay Nair Date: Thu, 15 Oct 2020 20:57:53 +0530 Subject: [PATCH] Adds line for edit api calls --- tests/domain-service.test.js | 12 ++++++------ utils/domain-service.js | 9 +++++---- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/tests/domain-service.test.js b/tests/domain-service.test.js index 19154db6e..9b774f117 100644 --- a/tests/domain-service.test.js +++ b/tests/domain-service.test.js @@ -120,8 +120,8 @@ describe('Domain service', () => { it('should resolve with a redirections', async () => { const zones = [ - { name: 'xx', type: 'CNAME', address: 'fck.com.' }, - { name: 'xx', type: 'A', address: '111.1.1212.1' }, + { line: '111', name: 'xx', type: 'CNAME', address: 'fck.com.' }, + { line: '112', name: 'xx', type: 'A', address: '111.1.1212.1' }, ]; const redirections = [ { domain: 'foo.booboo.xyz', destination: 'https://google.com' }, @@ -133,10 +133,10 @@ describe('Domain service', () => { const list = await mockDomainService.getHosts(); expect(list).toEqual([ - { name: 'xx', type: 'CNAME', address: 'fck.com' }, - { name: 'xx', type: 'A', address: '111.1.1212.1' }, - { name: 'foo', type: 'URL', address: 'https://google.com' }, - { name: 'foo1', type: 'URL', address: 'https://duck.com' }, + { id: '111', name: 'xx', type: 'CNAME', address: 'fck.com' }, + { id: '112', name: 'xx', type: 'A', address: '111.1.1212.1' }, + { id: `foo.${DOMAIN_DOMAIN}`, name: 'foo', type: 'URL', address: 'https://google.com' }, + { id: `foo1.${DOMAIN_DOMAIN}`, name: 'foo1', type: 'URL', address: 'https://duck.com' }, ]); }); }); diff --git a/utils/domain-service.js b/utils/domain-service.js index 733ca29b6..5d4467501 100644 --- a/utils/domain-service.js +++ b/utils/domain-service.js @@ -11,8 +11,8 @@ const recordToRedirection = ({ name, address }) => ({ redirect_wildcard: 1, redirect_www: 1, }); -const recordToZone = ({ name, type, address, ...rec }) => ({ - ...rec, //line +const recordToZone = ({ name, type, address, id }) => ({ + line: id, name, type, address, @@ -21,13 +21,14 @@ const recordToZone = ({ name, type, address, ...rec }) => ({ const cleanName = name => `${name}`.replace(new RegExp(`\.${DOMAIN_DOMAIN}\.?$`), '').toLowerCase(); -const zoneToRecord = ({ name, type, cname, address, record, ...host }) => ({ - ...host, +const zoneToRecord = ({ name, type, cname, address, record, line: id }) => ({ + id, name: cleanName(name), type: `${type}`, address: `${cname || address || record}`.replace(/\.$/g, '').toLowerCase(), }); const redirectionToRecord = ({ domain, destination }) => ({ + id: domain, name: cleanName(domain), type: 'URL', address: `${destination}`.replace(/\/$/g, ''),