From 2027fb19019b2087336e98f29fff896549484c9c Mon Sep 17 00:00:00 2001 From: Kuzmin Dmitry Date: Thu, 12 Oct 2017 16:36:19 +0500 Subject: [PATCH 01/14] bad code - dont watch! --- phone-book.js | 66 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 61 insertions(+), 5 deletions(-) diff --git a/phone-book.js b/phone-book.js index 69fb468..89c843f 100644 --- a/phone-book.js +++ b/phone-book.js @@ -1,15 +1,17 @@ 'use strict'; - +function isValidPhone(phone) { + return /^([0-9]){10}$/.test(phone); + } /** * Сделано задание на звездочку * Реализован метод importFromCsv */ -exports.isStar = true; +exports.isStar = false; /** * Телефонная книга */ -var phoneBook; +var phoneBook=[]; /** * Добавление записи в телефонную книгу @@ -18,7 +20,20 @@ var phoneBook; * @param {String} email */ exports.add = function (phone, name, email) { + for (var i = 0; i < phoneBook.length; i++) { + if (phone === phoneBook[i].phone || + phoneBook[i].email === email) return false; + + } + if (!isValidPhone(phone)) return false; + if (name === undefined) return false; + phoneBook.push({ + phone: phone, + name: name, + email: email + }); + return true; }; /** @@ -28,7 +43,13 @@ exports.add = function (phone, name, email) { * @param {String} email */ exports.update = function (phone, name, email) { - + for (var i = 0; i < phoneBook.length; i++) { + if (phone === phoneBook[i].phone) { + phoneBook[i].name = name; + phoneBook[i].email = email; + } + } + return true; }; /** @@ -36,7 +57,17 @@ exports.update = function (phone, name, email) { * @param {String} query */ exports.findAndRemove = function (query) { - + var numberOfDelete=0; + for (var i = 0; i < phoneBook.length; i++) { + if (phoneBook[i].phone.indexOf(query)!==-1 || + phoneBook[i].name.indexOf(query)!==-1 || + (phoneBook[i].email!== undefined && phoneBook[i].email.indexOf(query)!==-1)) { + phoneBook.splice(i, 1); + i--; + numberOfDelete++; + } + } + return numberOfDelete; }; /** @@ -44,7 +75,32 @@ exports.findAndRemove = function (query) { * @param {String} query */ exports.find = function (query) { + if (query === '') { + return []; + } + if (query === '*') { + query = ''; + } + var arrFindSort = []; + for (var i = 0; i < phoneBook.length; i++) { + if (phoneBook[i].phone.indexOf(query)!==-1 || + phoneBook[i].name.indexOf(query)!==-1 || + (phoneBook[i].email!== undefined && phoneBook[i].email.indexOf(query)!==-1) + ) + // console.log(phoneBook[i].phone + ' '+ phoneBook[i].name+ ' '+phoneBook[i].email); + + if (phoneBook[i].email!== undefined) + arrFindSort.push(phoneBook[i].name + ',' + ' +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' + + phoneBook[i].phone.slice(3, 6) + '-' + + + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10)+ ', '+phoneBook[i].email); +else +arrFindSort.push(phoneBook[i].name + ',' + ' +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' ++ phoneBook[i].phone.slice(3, 6) + '-' + ++ phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10)); +} + + return arrFindSort.sort(); }; /** From 9bd31a56c887dcc42a2907198ff0d7d0180d19b7 Mon Sep 17 00:00:00 2001 From: Kuzmin Dmitry Date: Thu, 12 Oct 2017 16:46:44 +0500 Subject: [PATCH 02/14] bad code - dont watch! --- phone-book.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/phone-book.js b/phone-book.js index 89c843f..e00b293 100644 --- a/phone-book.js +++ b/phone-book.js @@ -1,7 +1,7 @@ 'use strict'; function isValidPhone(phone) { - return /^([0-9]){10}$/.test(phone); - } + return /^([0-9]){10}$/.test(phone); +} /** * Сделано задание на звездочку * Реализован метод importFromCsv @@ -11,19 +11,20 @@ exports.isStar = false; /** * Телефонная книга */ -var phoneBook=[]; +var phoneBook = []; /** * Добавление записи в телефонную книгу * @param {String} phone * @param {String} name * @param {String} email + * @returns {Bool} result */ exports.add = function (phone, name, email) { for (var i = 0; i < phoneBook.length; i++) { - if (phone === phoneBook[i].phone || - phoneBook[i].email === email) return false; - + if (phone === phoneBook[i].phone || phoneBook[i].email === email){ + return false; + } } if (!isValidPhone(phone)) return false; if (name === undefined) return false; From 26792592543d927cca5b9d44030ee0dc98661ed2 Mon Sep 17 00:00:00 2001 From: Kuzmin Dmitry Date: Thu, 12 Oct 2017 16:53:23 +0500 Subject: [PATCH 03/14] bad code - dont watch! --- phone-book.js | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/phone-book.js b/phone-book.js index e00b293..087e4f0 100644 --- a/phone-book.js +++ b/phone-book.js @@ -2,6 +2,7 @@ function isValidPhone(phone) { return /^([0-9]){10}$/.test(phone); } + /** * Сделано задание на звездочку * Реализован метод importFromCsv @@ -22,12 +23,16 @@ var phoneBook = []; */ exports.add = function (phone, name, email) { for (var i = 0; i < phoneBook.length; i++) { - if (phone === phoneBook[i].phone || phoneBook[i].email === email){ + if (phone === phoneBook[i].phone || phoneBook[i].email === email) { return false; } } - if (!isValidPhone(phone)) return false; - if (name === undefined) return false; + if (!isValidPhone(phone)) { + return false; + } + if (name === undefined) { + return false; + } phoneBook.push({ phone: phone, name: name, @@ -42,38 +47,43 @@ exports.add = function (phone, name, email) { * @param {String} phone * @param {String} name * @param {String} email + * @returns {Bool} result */ exports.update = function (phone, name, email) { for (var i = 0; i < phoneBook.length; i++) { if (phone === phoneBook[i].phone) { - phoneBook[i].name = name; - phoneBook[i].email = email; + phoneBook[i].name = name; + phoneBook[i].email = email; } } - return true; + + return true; }; /** * Удаление записей по запросу из телефонной книги * @param {String} query + * @returns {Number} resultOfOperation */ exports.findAndRemove = function (query) { - var numberOfDelete=0; + var numberOfDelete = 0; for (var i = 0; i < phoneBook.length; i++) { - if (phoneBook[i].phone.indexOf(query)!==-1 || - phoneBook[i].name.indexOf(query)!==-1 || - (phoneBook[i].email!== undefined && phoneBook[i].email.indexOf(query)!==-1)) { + if (phoneBook[i].phone.indexOf(query) !==-1 || + phoneBook[i].name.indexOf(query) !==-1 || + (phoneBook[i].email !== undefined && phoneBook[i].email.indexOf(query) !==-1)) { phoneBook.splice(i, 1); i--; numberOfDelete++; } } + return numberOfDelete; }; /** * Поиск записей по запросу в телефонной книге * @param {String} query + * @returns {Array} result */ exports.find = function (query) { if (query === '') { From 3ff4eb3cc8450feffbfaf68491dab97e1f825d9a Mon Sep 17 00:00:00 2001 From: Kuzmin Dmitry Date: Thu, 12 Oct 2017 16:58:09 +0500 Subject: [PATCH 04/14] bad code - dont watch! --- phone-book.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/phone-book.js b/phone-book.js index 087e4f0..c9914c4 100644 --- a/phone-book.js +++ b/phone-book.js @@ -68,9 +68,9 @@ exports.update = function (phone, name, email) { exports.findAndRemove = function (query) { var numberOfDelete = 0; for (var i = 0; i < phoneBook.length; i++) { - if (phoneBook[i].phone.indexOf(query) !==-1 || - phoneBook[i].name.indexOf(query) !==-1 || - (phoneBook[i].email !== undefined && phoneBook[i].email.indexOf(query) !==-1)) { + if (phoneBook[i].phone.indexOf(query) !== -1 || + phoneBook[i].name.indexOf(query) !== -1 || + (phoneBook[i].email !== undefined && phoneBook[i].email.indexOf(query) !== -1)) { phoneBook.splice(i, 1); i--; numberOfDelete++; @@ -97,8 +97,7 @@ exports.find = function (query) { if (phoneBook[i].phone.indexOf(query)!==-1 || phoneBook[i].name.indexOf(query)!==-1 || (phoneBook[i].email!== undefined && phoneBook[i].email.indexOf(query)!==-1) - ) - // console.log(phoneBook[i].phone + ' '+ phoneBook[i].name+ ' '+phoneBook[i].email); + ) { if (phoneBook[i].email!== undefined) arrFindSort.push(phoneBook[i].name + ',' + ' +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' @@ -108,6 +107,7 @@ else arrFindSort.push(phoneBook[i].name + ',' + ' +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' + phoneBook[i].phone.slice(3, 6) + '-' + + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10)); +} } From 0f94f723ebaa37aa88b5de5a67502d9190317abf Mon Sep 17 00:00:00 2001 From: Kuzmin Dmitry Date: Thu, 12 Oct 2017 17:05:42 +0500 Subject: [PATCH 05/14] bad code - dont watch! --- phone-book.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/phone-book.js b/phone-book.js index c9914c4..ed9114f 100644 --- a/phone-book.js +++ b/phone-book.js @@ -94,21 +94,19 @@ exports.find = function (query) { } var arrFindSort = []; for (var i = 0; i < phoneBook.length; i++) { - if (phoneBook[i].phone.indexOf(query)!==-1 || + if (phoneBook[i].email!== undefined && (phoneBook[i].phone.indexOf(query)!==-1 || phoneBook[i].name.indexOf(query)!==-1 || (phoneBook[i].email!== undefined && phoneBook[i].email.indexOf(query)!==-1) - ) { - - if (phoneBook[i].email!== undefined) + )) arrFindSort.push(phoneBook[i].name + ',' + ' +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' + phoneBook[i].phone.slice(3, 6) + '-' + + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10)+ ', '+phoneBook[i].email); -else + else arrFindSort.push(phoneBook[i].name + ',' + ' +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' + phoneBook[i].phone.slice(3, 6) + '-' + + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10)); } -} + return arrFindSort.sort(); From d54b755cbad43231796a0f2eea4337887092e709 Mon Sep 17 00:00:00 2001 From: Kuzmin Dmitry Date: Thu, 12 Oct 2017 17:17:04 +0500 Subject: [PATCH 06/14] bad code - dont watch! --- phone-book.js | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/phone-book.js b/phone-book.js index ed9114f..e256cdc 100644 --- a/phone-book.js +++ b/phone-book.js @@ -94,10 +94,8 @@ exports.find = function (query) { } var arrFindSort = []; for (var i = 0; i < phoneBook.length; i++) { - if (phoneBook[i].email!== undefined && (phoneBook[i].phone.indexOf(query)!==-1 || - phoneBook[i].name.indexOf(query)!==-1 || - (phoneBook[i].email!== undefined && phoneBook[i].email.indexOf(query)!==-1) - )) + if (some(phoneBook[i].phone, phoneBook[i].name, phoneBook[i].email, query) + ) arrFindSort.push(phoneBook[i].name + ',' + ' +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' + phoneBook[i].phone.slice(3, 6) + '-' + + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10)+ ', '+phoneBook[i].email); @@ -107,11 +105,20 @@ arrFindSort.push(phoneBook[i].name + ',' + ' +7 (' + phoneBook[i].phone.slice(0, + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10)); } - - return arrFindSort.sort(); }; +function some(phone, name, email, query){ + if (phone !== undefined && (phone.indexOf(query)!==-1 || + name.indexOf(query)!==-1 || + (email!== undefined && email.indexOf(query)!==-1))){ + + return true; + } + + return false; +} + /** * Импорт записей из csv-формата * @star From e2805c238250af2cc7ede84363a0c1b95b523c92 Mon Sep 17 00:00:00 2001 From: Kuzmin Dmitry Date: Thu, 12 Oct 2017 17:20:31 +0500 Subject: [PATCH 07/14] bad code - dont watch! --- phone-book.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/phone-book.js b/phone-book.js index e256cdc..549b20d 100644 --- a/phone-book.js +++ b/phone-book.js @@ -94,15 +94,16 @@ exports.find = function (query) { } var arrFindSort = []; for (var i = 0; i < phoneBook.length; i++) { - if (some(phoneBook[i].phone, phoneBook[i].name, phoneBook[i].email, query) - ) - arrFindSort.push(phoneBook[i].name + ',' + ' +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' - + phoneBook[i].phone.slice(3, 6) + '-' + - + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10)+ ', '+phoneBook[i].email); - else -arrFindSort.push(phoneBook[i].name + ',' + ' +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' -+ phoneBook[i].phone.slice(3, 6) + '-' + -+ phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10)); + if (some(phoneBook[i].phone, phoneBook[i].name, phoneBook[i].email, query)) { + arrFindSort.push(phoneBook[i].name + ',' + ' +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' + + phoneBook[i].phone.slice(3, 6) + '-' + + + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10)+ ', '+phoneBook[i].email); + } + else { + arrFindSort.push(phoneBook[i].name + ',' + ' +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' + + phoneBook[i].phone.slice(3, 6) + '-' + + + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10)); + } } return arrFindSort.sort(); From c1a4b82117afdacd49d0d607a3165fd83a6cd1b3 Mon Sep 17 00:00:00 2001 From: Kuzmin Dmitry Date: Thu, 12 Oct 2017 17:23:07 +0500 Subject: [PATCH 08/14] bad code - dont watch! --- phone-book.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/phone-book.js b/phone-book.js index 549b20d..7be7d3d 100644 --- a/phone-book.js +++ b/phone-book.js @@ -95,9 +95,11 @@ exports.find = function (query) { var arrFindSort = []; for (var i = 0; i < phoneBook.length; i++) { if (some(phoneBook[i].phone, phoneBook[i].name, phoneBook[i].email, query)) { - arrFindSort.push(phoneBook[i].name + ',' + ' +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' + arrFindSort.push(phoneBook[i].name + ',' + + ' +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' + phoneBook[i].phone.slice(3, 6) + '-' + - + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10)+ ', '+phoneBook[i].email); + + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10) + + ', '+phoneBook[i].email); } else { arrFindSort.push(phoneBook[i].name + ',' + ' +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' From 7e32ab9c8be48296881ee4e784bd0de09078a0fd Mon Sep 17 00:00:00 2001 From: Kuzmin Dmitry Date: Thu, 12 Oct 2017 17:27:01 +0500 Subject: [PATCH 09/14] bad code - dont watch! --- phone-book.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/phone-book.js b/phone-book.js index 7be7d3d..fe43775 100644 --- a/phone-book.js +++ b/phone-book.js @@ -95,11 +95,11 @@ exports.find = function (query) { var arrFindSort = []; for (var i = 0; i < phoneBook.length; i++) { if (some(phoneBook[i].phone, phoneBook[i].name, phoneBook[i].email, query)) { - arrFindSort.push(phoneBook[i].name + ',' - + ' +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' - + phoneBook[i].phone.slice(3, 6) + '-' + - + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10) - + ', '+phoneBook[i].email); + arrFindSort.push(phoneBook[i].name + ',' + + ' +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' + + phoneBook[i].phone.slice(3, 6) + '-' + + phoneBook[i].phone.slice(6, 8) + '-' + + phoneBook[i].phone.slice(8, 10) + ', ' + phoneBook[i].email); } else { arrFindSort.push(phoneBook[i].name + ',' + ' +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' @@ -111,10 +111,10 @@ exports.find = function (query) { return arrFindSort.sort(); }; -function some(phone, name, email, query){ - if (phone !== undefined && (phone.indexOf(query)!==-1 || - name.indexOf(query)!==-1 || - (email!== undefined && email.indexOf(query)!==-1))){ +function some(phone, name, email, query) { + if (phone !== undefined && (phone.indexOf(query) !== -1 || + name.indexOf(query) !== -1 || + (email !== undefined && email.indexOf(query) !== -1))){ return true; } From dbd366b5dfb184cbfd3d7484c3f86915aee8cdf6 Mon Sep 17 00:00:00 2001 From: Kuzmin Dmitry Date: Thu, 12 Oct 2017 17:30:02 +0500 Subject: [PATCH 10/14] bad code - dont watch! --- phone-book.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/phone-book.js b/phone-book.js index fe43775..80c3161 100644 --- a/phone-book.js +++ b/phone-book.js @@ -102,9 +102,10 @@ exports.find = function (query) { phoneBook[i].phone.slice(8, 10) + ', ' + phoneBook[i].email); } else { - arrFindSort.push(phoneBook[i].name + ',' + ' +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' - + phoneBook[i].phone.slice(3, 6) + '-' + - + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10)); + arrFindSort.push(phoneBook[i].name + ',' + + ' +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' + + phoneBook[i].phone.slice(3, 6) + '-' + + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10)); } } @@ -114,9 +115,9 @@ exports.find = function (query) { function some(phone, name, email, query) { if (phone !== undefined && (phone.indexOf(query) !== -1 || name.indexOf(query) !== -1 || - (email !== undefined && email.indexOf(query) !== -1))){ + (email !== undefined && email.indexOf(query) !== -1))) { - return true; + return true; } return false; From 4ec64f0dce7dcb9117fc2accf7c19dc79227b5ee Mon Sep 17 00:00:00 2001 From: Kuzmin Dmitry Date: Thu, 12 Oct 2017 17:32:36 +0500 Subject: [PATCH 11/14] bad code - dont watch! --- phone-book.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/phone-book.js b/phone-book.js index 80c3161..e48d05d 100644 --- a/phone-book.js +++ b/phone-book.js @@ -100,14 +100,13 @@ exports.find = function (query) { phoneBook[i].phone.slice(3, 6) + '-' + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10) + ', ' + phoneBook[i].email); - } - else { + } else { arrFindSort.push(phoneBook[i].name + ',' + ' +7 (' + phoneBook[i].phone.slice(0, 3) + ') ' + phoneBook[i].phone.slice(3, 6) + '-' + phoneBook[i].phone.slice(6, 8) + '-' + phoneBook[i].phone.slice(8, 10)); } -} + } return arrFindSort.sort(); }; From b1c4c7e18c9a81df2a91ee347821ddbd869ee369 Mon Sep 17 00:00:00 2001 From: Kuzmin Dmitry Date: Thu, 12 Oct 2017 17:42:09 +0500 Subject: [PATCH 12/14] bad code - dont watch! --- phone-book.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phone-book.js b/phone-book.js index e48d05d..e363c57 100644 --- a/phone-book.js +++ b/phone-book.js @@ -112,7 +112,7 @@ exports.find = function (query) { }; function some(phone, name, email, query) { - if (phone !== undefined && (phone.indexOf(query) !== -1 || + if (email !== undefined && (phone.indexOf(query) !== -1 || name.indexOf(query) !== -1 || (email !== undefined && email.indexOf(query) !== -1))) { From d0b94d0cf6b6a239f6ca6b34073a9a8994f1a583 Mon Sep 17 00:00:00 2001 From: Kuzmin Dmitry Date: Thu, 12 Oct 2017 17:47:13 +0500 Subject: [PATCH 13/14] bad code - dont watch! --- phone-book.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/phone-book.js b/phone-book.js index e363c57..236156c 100644 --- a/phone-book.js +++ b/phone-book.js @@ -27,6 +27,14 @@ exports.add = function (phone, name, email) { return false; } } + if (typeof(phone) !== 'string' || typeof(name) !== 'string' || typeof(email) !== 'string') { + + return false; + } + if (arguments.length > 3) { + + return false; + } if (!isValidPhone(phone)) { return false; } @@ -50,6 +58,20 @@ exports.add = function (phone, name, email) { * @returns {Bool} result */ exports.update = function (phone, name, email) { + if (typeof(phone) !== 'string' || typeof(name) !== 'string' || typeof(email) !== 'string') { + + return false; + } + if (arguments.length > 3) { + + return false; + } + if (!isValidPhone(phone)) { + return false; + } + if (name === undefined) { + return false; + } for (var i = 0; i < phoneBook.length; i++) { if (phone === phoneBook[i].phone) { phoneBook[i].name = name; From fa0b98b6c4a7ba6dae0eafaa2f00a92fa64b3d50 Mon Sep 17 00:00:00 2001 From: Kuzmin Dmitry Date: Thu, 12 Oct 2017 17:49:38 +0500 Subject: [PATCH 14/14] bad code - dont watch! --- phone-book.js | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/phone-book.js b/phone-book.js index 236156c..d14d060 100644 --- a/phone-book.js +++ b/phone-book.js @@ -27,15 +27,12 @@ exports.add = function (phone, name, email) { return false; } } - if (typeof(phone) !== 'string' || typeof(name) !== 'string' || typeof(email) !== 'string') { - - return false; - } if (arguments.length > 3) { return false; } if (!isValidPhone(phone)) { + return false; } if (name === undefined) { @@ -58,20 +55,6 @@ exports.add = function (phone, name, email) { * @returns {Bool} result */ exports.update = function (phone, name, email) { - if (typeof(phone) !== 'string' || typeof(name) !== 'string' || typeof(email) !== 'string') { - - return false; - } - if (arguments.length > 3) { - - return false; - } - if (!isValidPhone(phone)) { - return false; - } - if (name === undefined) { - return false; - } for (var i = 0; i < phoneBook.length; i++) { if (phone === phoneBook[i].phone) { phoneBook[i].name = name;