From 5919e930371ea41d6248681c0f024064b5a1e58c Mon Sep 17 00:00:00 2001 From: FennyLiang Date: Tue, 26 Jul 2016 13:41:56 +0800 Subject: [PATCH 01/14] week2 HW first commit --- database.db | Bin 4096 -> 7168 bytes package.json | 4 +- src/models/friends.js | 16 +++++ src/models/post.js | 1 + test/unit/database/practice.test.js | 15 +++-- test/unit/facebook/friends.test.js | 101 ++++++++++++++++++++++++++++ test/unit/facebook/helper.test.js | 6 +- 7 files changed, 134 insertions(+), 9 deletions(-) create mode 100644 src/models/friends.js create mode 100644 test/unit/facebook/friends.test.js diff --git a/database.db b/database.db index 3f8ea29c89b51cba05d8a6532ceaa61bd2b83607..d35991517b562c8117cdd0ad1821c77b2cdb0b9c 100644 GIT binary patch literal 7168 zcmeHLe@q)y9Dnbw9NWzN!x*dK51-K~gh2`fru^e7Hci@Km#BI8xaCvjTQiqkH7M@Y6Lel|Mc)L zT++Ty6UQi-pI=Mf2{bSd5TB6M@G@@v*Dit0%hzhPa90^mZ}l)u9OLJbx4asgL2ox8 zyZ$k=0XdUnPE_b*T~1`Q+6}b^8)~o_Eqa>+nG6o3Z?e}Lt=P$8u-exnX8=d?(yfdW zZPMFn>h!k4^2*90Y+zbx*0W-?jpn!)e105!+285yID|YQ_HOYrG|#y7yc0c+muELx z49Hq%YbzO6jVAUkCw(m@0ZSZkCm%M4xu_nhd!OF9|XC+VV*s}8X-(q?kXqnXf|LE5NE2k9_Ea!~@8Pc9M>;wcb? zhu|uLA_=lNiCNXn)OY^y!u~}o1?~k#>9w(+YW|AMA=x9uvcFD|;zhO~Ul0u~V_$hf*;U(MfTnGrl{l?4@iq z3DNM+Z}gm9or)O?cf~^o#o+_WUdmQ;sOR{Zsn}~wYUdky#^a$;Z9vt|TS7exvDty4 zovCeVV0gxlQpWKyWAjiNh%)lLxETH695%9pHPrGO9|CG*u+FSiCj6Vl0$3TvObOv(gKb?>S-v*o%`99nNoMbaGL6TSln1n|N3a(bqL>B6QXc7i5hkki|LawW0gS&C5 zni!j0S?S!ks6gP-GF1`DCGbEr9vqH;bVyCmEY$x1n1q7^(S>hM+#}c3Z@n`wbc@qR zRV`E)ox0l5{du)qSMTee`!Jd~F{mzPC={BD&GM<3V()Nl&tWmrsU{{ceH=gc*Tna? z%Q3q;=ZCrzCsl0{CNy{{G1EIb7L*V_bj)Om&Qs{W0})hR{pRo44QJ}^e{;$l@?10wtigwNswc1zlSSK!=BWh6<09~6oYdZZPQ zVZgi8uBB_Xj%@8wT}KX|b5PFlx(+f-TYsWksA(Au&1$1(dK+mid(SZ0qK0nT8^}3j zq+{GC4tk+kyH7PMr&cO?W*~j+^(JNqI0(-CA%l;-jt?2)${}0r4hg2Dt5F9%W}jyp z4IP<#HZoiFdgyh~oodcEg|t*Cz&4LGIO(z9`BgwpPRX%L#)e`n`Y~fJjBA6f%(L{| zji}f31DZ~ydD6~Jkqi6&Eq5210^SKRw8Q8AMp)|6-lVEs61WrE4The(F!fehSWx^3 z*p;+Ifkc7jRbU@xz@7WhFb1sZAk6!)Ky+1Ed03RUimHlarMkIYt;i)=l~F;Kt1^4I z$@+8uUjp%Rc>_xBg|k^8 zDH5xvlmv8>ceOY8$oEUG-!IWKJ|j((PgyB#ZSPDgt}$yT!(0@8xhRLga_ulYDTglj zaBVJrI?7i=pc?0^>vQpMMfpm|SK@r-_B?!?`sWnvRLVD`U}Wux(GX@&!HDp?07ur2 V5arLFf)U{ld>G}=o`PBVKLE?bgt-6! diff --git a/package.json b/package.json index b1eba65..aefaf15 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,8 @@ "coveralls": "cat ./coverage/lcov.info | coveralls", "prepublish": "npm run compile", "test": "./node_modules/.bin/mocha", - "watchdb": "sqlite3 database.db 'select * from users'", - "watchPost": "sqlite3 database.db 'select * from posts'" + "watchdb": "sqlite3 database.db 'select * from friends'", + "watchPost": "sqlite3 database.db 'select * from friends'" }, "devDependencies": { "babel-cli": "*", diff --git a/src/models/friends.js b/src/models/friends.js new file mode 100644 index 0000000..aee5ad0 --- /dev/null +++ b/src/models/friends.js @@ -0,0 +1,16 @@ +'use strict'; + +module.exports = (sequelize, DataTypes) => { + var friends = sequelize.define ('friends', { + name: DataTypes.STRING, + email: DataTypes.STRING + }, { + classMethods: { + associate: (models) => { + } + } + }); + + return friends; + +} \ No newline at end of file diff --git a/src/models/post.js b/src/models/post.js index 9f437cf..f47bb26 100644 --- a/src/models/post.js +++ b/src/models/post.js @@ -4,6 +4,7 @@ module.exports = (sequelize, DataTypes) => { var Post = sequelize.define('Post', { title: DataTypes.STRING, desc: DataTypes.STRING, + price: DataTypes.INTEGER }, { classMethods: { associate: (models) => { diff --git a/test/unit/database/practice.test.js b/test/unit/database/practice.test.js index 8918755..b3327fa 100644 --- a/test/unit/database/practice.test.js +++ b/test/unit/database/practice.test.js @@ -42,7 +42,7 @@ describe('practice', () => { price: 100, }; - let result; + let result = await models.Post.create(input); result.title.should.be.eq('AAA'); result.desc.should.be.eq('BBB'); @@ -74,7 +74,8 @@ describe('practice', () => { it('使用 sequelize 尋找 targetPost ', async (done) => { try { - let findTarget; + let findTarget = await models.Post.findOne({id: targetPost.id}); + //models.Post.findById(targetPost.id) 也會pass findTarget.id.should.be.eq(targetPost.id); done(); @@ -91,8 +92,11 @@ describe('practice', () => { price: 999, } - let findTarget; - let result; + let findTarget = await models.Post.findById(targetPost.id); + findTarget.title = input.title; + findTarget.desc = input.desc; + findTarget.price = input.price; + let result = await findTarget.save(); result.title.should.be.eq(input.title); result.desc.should.be.eq(input.desc); @@ -106,7 +110,8 @@ describe('practice', () => { it('使用 sequelize 刪除 targetPost', async (done) => { try { - let findTarget; + let findTarget = await models.Post.findById(targetPost.id); + await findTarget.destroy(); let check = await models.Post.findAll(); (check.length === 0).should.be.true; diff --git a/test/unit/facebook/friends.test.js b/test/unit/facebook/friends.test.js new file mode 100644 index 0000000..46e3625 --- /dev/null +++ b/test/unit/facebook/friends.test.js @@ -0,0 +1,101 @@ +import FacebookHelper from '../../../src/facebook/helper.js' +import task1_initModel from '../../../src/database/task1'; + +describe.only('Facebook model test here', () => { + let facebookHelper = null; + let model = null; + let friendsList = []; + let friends = []; + + before( async (done) => { + + let userId = "718145738235098"; + let token = "EAACEdEose0cBAKwxkCTHTxZCt4gFmqgCJ79QZAtnzUrg2gaibUqFWZAY3BEBrqOedhc96FB6w6EsIuXpGvOpZBzoUSGVsu8mGGw9GCZAZAV9CTj64JL4NOPkijgVL95DZAr0EccRSbc5rHDHLNZBnup7WK2aFkOFAs0g5QzPUSya6QZDZD"; + facebookHelper = await new FacebookHelper({userId, token}); + model = await task1_initModel(); + + done(); + + }); + + + it('create your friends list', async (done) => { + + try{ + friendsList = await facebookHelper.getFriends(); + console.log('friendsList:::::' + friendsList); + console.log(`Model: ${model}, friends: ${model.friends}`) + friends = await model.friends.bulkCreate(friendsList); + + let result = friends.filter((friend) => { return friend.name == 'Calvin Huang' }) + result.length.should.be.eq(1) + + done(); + } catch(e){ + done(e); + } + + }); + + it('Find your friend', async (done) => { + try{ + + let findFriend = await model.friends.findOne({id: friends.id}); + + // console.log(`id::::::${friends[0].id}`); + console.log(`findFriend:::${findFriend}`); + + + findFriend.should.have.valueOf(friends[0].id); + + done(); + + } catch(e){ + done(e); + } + + }); + + it('Update your friends data', async (done) => { + try{ + const upd = { + name: "Trunk-studio", + email: "hellojs@trunk.studio", + } + + let updFriend = await model.friends.findById(friends[3].id); + console.log(updFriend); + + updFriend.name = upd.name; + updFriend.email = upd.email; + + let result = await updFriend.save(); + + result.name.should.be.eq(upd.name); + result.email.should.be.eq(upd.email); + + done(); + } catch(e){ + done(e); + } + }); + + + it('Delete your friend data', async (done) =>{ + + try{ + + let trunk = await model.friends.findOne({ where : {name: 'Trunk-studio'}}); + + console.log(`trunk::: ${trunk}`); + await trunk.destroy(); + + let check = await model.friends.findOne({ where : {name: 'Trunk-studio'}}); + (check === null).should.be.true; + + done(); + } catch(e){ + done(e); + } + }); +}); diff --git a/test/unit/facebook/helper.test.js b/test/unit/facebook/helper.test.js index 6856c56..7e88471 100644 --- a/test/unit/facebook/helper.test.js +++ b/test/unit/facebook/helper.test.js @@ -1,11 +1,13 @@ import FacebookHelper from '../../../src/facebook/helper.js' + describe('facebook-helper', () => { let facebookHelper = null; + before((done) => { - let userId = ""; - let token = ""; + let userId = "718145738235098"; + let token = "EAACEdEose0cBAEkcosKegVyQm61gWxVDCTGg4l1VSnoT2Y3aQUq4t96IjHKETxzPuMK0HNsDdkONInFHdugqUIUDNXt6uBNP4IUaBk1Sr5P2qPTNGgiLmZBmGsiRHz0PNFCWTs5T1e5qgJYOBuy9ZC2kcGR8f1rfcAAam9dAZDZD"; facebookHelper = new FacebookHelper({userId, token}); console.log(facebookHelper); done(); From 7d9ecab6d3b360de1af9a2251bc0c59be14c3af6 Mon Sep 17 00:00:00 2001 From: FennyLiang Date: Tue, 26 Jul 2016 13:49:28 +0800 Subject: [PATCH 02/14] update package.json --- database.db | Bin 7168 -> 7168 bytes package.json | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/database.db b/database.db index d35991517b562c8117cdd0ad1821c77b2cdb0b9c..fad30a8b8c923c98ce012a73dd3a880da27416ec 100644 GIT binary patch delta 981 zcmZp$Xt0ak_Pl2yQzWMRCjF3%8Y`xZV0+6u19_#c<0l$0PS!47WQ2#BsX? zBisbwsY^lIz`)ADU=t4u%VZXb8qDA`HqbLLHJZE}PgLVe2KbT|zNGw1(g4#f&EZwY delta 977 zcmZp$Xt0}APwt<0_fx#q+2CN}xXk;;YIi6_7mjv)7D}2fLm!tt!w}3JOzT|-~S^bg1 O9pdB=H-C^ diff --git a/package.json b/package.json index aefaf15..b1eba65 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,8 @@ "coveralls": "cat ./coverage/lcov.info | coveralls", "prepublish": "npm run compile", "test": "./node_modules/.bin/mocha", - "watchdb": "sqlite3 database.db 'select * from friends'", - "watchPost": "sqlite3 database.db 'select * from friends'" + "watchdb": "sqlite3 database.db 'select * from users'", + "watchPost": "sqlite3 database.db 'select * from posts'" }, "devDependencies": { "babel-cli": "*", From eacac5c0f4506dbc54c8e532370a187fa79ad48e Mon Sep 17 00:00:00 2001 From: FennyLiang Date: Tue, 26 Jul 2016 15:00:28 +0800 Subject: [PATCH 03/14] update find friend method which db data compare with api list --- database.db | Bin 7168 -> 7168 bytes test/unit/facebook/friends.test.js | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/database.db b/database.db index fad30a8b8c923c98ce012a73dd3a880da27416ec..a287a82f4b8283403289d3deed128af45b570652 100644 GIT binary patch delta 1109 zcmZp$Xt0_K&8$q!tPITc%#AE3KV%g~ z;jdxQLE)pzGqU2B4`bEBtKVNz7q5JPv^HM(-xB!cm$TuQ|ILQq{ee>W-M5S#!+%_m z@B{`o+vXqaJRF-@cfSXce>#46Fk&$7gp%qX QDg3cSC@W#f%2+}f0JpCLXaE2J delta 1113 zcmZp$Xt0_KO|48Utc)!6EGW-M5S#!+%_m z@B{`o>*gQqJRFl*MC$SSVT}lWH!zCgmnRg)D@F19;lC*UFbWpKFTb3C{BJS*?hg>h z?>;PHEQFM16|@ZutPBh`@vyK=W|64E9@NGLdIqLOla~`nE`*X3q2x*^yZn;W!|pz4 Y_9K+s2qo7)Quw2aP { console.log(`findFriend:::${findFriend}`); - findFriend.should.have.valueOf(friends[0].id); + findFriend.should.have.valueOf(friendsList[0].id); done(); From 8c3e2dc45ecd36ecdf75c51805502171df93f1eb Mon Sep 17 00:00:00 2001 From: FennyLiang Date: Thu, 28 Jul 2016 17:27:14 +0900 Subject: [PATCH 04/14] - Fix code style. - Add Facebook id to store Facebook id. --- src/models/friends.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/models/friends.js b/src/models/friends.js index aee5ad0..0d25f8a 100644 --- a/src/models/friends.js +++ b/src/models/friends.js @@ -2,15 +2,16 @@ module.exports = (sequelize, DataTypes) => { var friends = sequelize.define ('friends', { - name: DataTypes.STRING, - email: DataTypes.STRING - }, { - classMethods: { - associate: (models) => { - } + name: DataTypes.STRING, + email: DataTypes.STRING, + facebookId: DataTypes.STRING + }, { + classMethods: { + associate: (models) => { } + } }); return friends; -} \ No newline at end of file +} From d3899d3f4ed1e782e0d20195b3be6da0295f08e6 Mon Sep 17 00:00:00 2001 From: FennyLiang Date: Thu, 28 Jul 2016 17:27:48 +0900 Subject: [PATCH 05/14] Change global property's name. --- test/unit/facebook/friends.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/facebook/friends.test.js b/test/unit/facebook/friends.test.js index 511724f..734c85a 100644 --- a/test/unit/facebook/friends.test.js +++ b/test/unit/facebook/friends.test.js @@ -4,7 +4,7 @@ import task1_initModel from '../../../src/database/task1'; describe.only('Facebook model test here', () => { let facebookHelper = null; let model = null; - let friendsList = []; + let rawFriends = []; let friends = []; before( async (done) => { From 790efa55e7d075c5f7e9928dcb824d2829cad6c3 Mon Sep 17 00:00:00 2001 From: FennyLiang Date: Thu, 28 Jul 2016 17:28:58 +0900 Subject: [PATCH 06/14] Prepare friends data at before to fit language mean. --- test/unit/facebook/friends.test.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/unit/facebook/friends.test.js b/test/unit/facebook/friends.test.js index 734c85a..285c0ba 100644 --- a/test/unit/facebook/friends.test.js +++ b/test/unit/facebook/friends.test.js @@ -14,7 +14,14 @@ describe.only('Facebook model test here', () => { facebookHelper = await new FacebookHelper({userId, token}); model = await task1_initModel(); - done(); + try { + rawFriends = await facebookHelper.getFriends() + + done(); + } catch(e) { + done(e); + } + }); }); From 98dba92fa24fd6b2a496bead95d268273920b398 Mon Sep 17 00:00:00 2001 From: FennyLiang Date: Thu, 28 Jul 2016 17:30:20 +0900 Subject: [PATCH 07/14] Add test to ensure fetch friends success. (However, some people have no friends, that is not issue in this case) --- test/unit/facebook/friends.test.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/unit/facebook/friends.test.js b/test/unit/facebook/friends.test.js index 285c0ba..f2acbe1 100644 --- a/test/unit/facebook/friends.test.js +++ b/test/unit/facebook/friends.test.js @@ -23,6 +23,8 @@ describe.only('Facebook model test here', () => { } }); + it('If friends from FB API should not empty', () => { + rawFriends.length.should.be.above(0); }); From ccaa55606499e7f9629489d8e77e761f42221e02 Mon Sep 17 00:00:00 2001 From: FennyLiang Date: Thu, 28 Jul 2016 17:31:35 +0900 Subject: [PATCH 08/14] Map api response to our model's format manually. --- test/unit/facebook/friends.test.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/unit/facebook/friends.test.js b/test/unit/facebook/friends.test.js index f2acbe1..5796bde 100644 --- a/test/unit/facebook/friends.test.js +++ b/test/unit/facebook/friends.test.js @@ -27,8 +27,18 @@ describe.only('Facebook model test here', () => { rawFriends.length.should.be.above(0); }); + it('Create your friends list', async (done) => { + + try { + let formattedFriends = rawFriends.map((rawFriend) => { + let friend = {}; + friend.name = rawFriend.name; + friend.email = rawFriend.email; + friend.facebookId = rawFriend.id; it('create your friends list', async (done) => { + return friend; + }); try{ friendsList = await facebookHelper.getFriends(); From dbc6b8b166b01f227c9201c1ed73156fbe826fda Mon Sep 17 00:00:00 2001 From: FennyLiang Date: Thu, 28 Jul 2016 17:32:07 +0900 Subject: [PATCH 09/14] Fix syntax. --- test/unit/facebook/friends.test.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/unit/facebook/friends.test.js b/test/unit/facebook/friends.test.js index 5796bde..4aa570b 100644 --- a/test/unit/facebook/friends.test.js +++ b/test/unit/facebook/friends.test.js @@ -36,7 +36,6 @@ describe.only('Facebook model test here', () => { friend.email = rawFriend.email; friend.facebookId = rawFriend.id; - it('create your friends list', async (done) => { return friend; }); From cc1aa2681112579332dcb60aa133b7ff13e56211 Mon Sep 17 00:00:00 2001 From: FennyLiang Date: Thu, 28 Jul 2016 17:33:14 +0900 Subject: [PATCH 10/14] - Fix code style. - Change property's name. --- test/unit/facebook/friends.test.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/test/unit/facebook/friends.test.js b/test/unit/facebook/friends.test.js index 4aa570b..c7780b0 100644 --- a/test/unit/facebook/friends.test.js +++ b/test/unit/facebook/friends.test.js @@ -39,17 +39,14 @@ describe.only('Facebook model test here', () => { return friend; }); - try{ - friendsList = await facebookHelper.getFriends(); - console.log('friendsList:::::' + friendsList); - console.log(`Model: ${model}, friends: ${model.friends}`) - friends = await model.friends.bulkCreate(friendsList); + // console.log(`friendsList:::::${friendsList}`); + // console.log(`Model: ${model}, friends: ${model.friends}`); + friends = await model.friends.bulkCreate(formattedFriends); - let result = friends.filter((friend) => { return friend.name == 'Calvin Huang' }) - result.length.should.be.eq(1) + result.length.should.be.eq(1); done(); - } catch(e){ + } catch(e) { done(e); } From 4d6b1deefaf41b1c95a8f8c355ea5d63f7eec799 Mon Sep 17 00:00:00 2001 From: FennyLiang Date: Thu, 28 Jul 2016 17:33:45 +0900 Subject: [PATCH 11/14] Fix test for find. --- test/unit/facebook/friends.test.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/test/unit/facebook/friends.test.js b/test/unit/facebook/friends.test.js index c7780b0..8818589 100644 --- a/test/unit/facebook/friends.test.js +++ b/test/unit/facebook/friends.test.js @@ -53,15 +53,14 @@ describe.only('Facebook model test here', () => { }); it('Find your friend', async (done) => { - try{ + try { - let findFriend = await model.friends.findOne({id: friends.id}); + let resultFriend = await model.friends.findOne({facebookId: rawFriends[0].id}); // console.log(`id::::::${friends[0].id}`); - console.log(`findFriend:::${findFriend}`); - + console.log(`result of findFriend:::${resultFriend}`); - findFriend.should.have.valueOf(friendsList[0].id); + resultFriend.should.not.be.eq(null); done(); From 981786a55f76d689d51b07f345e96c7f14ae1715 Mon Sep 17 00:00:00 2001 From: FennyLiang Date: Thu, 28 Jul 2016 17:34:10 +0900 Subject: [PATCH 12/14] Change name. --- test/unit/facebook/friends.test.js | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/test/unit/facebook/friends.test.js b/test/unit/facebook/friends.test.js index 8818589..cfbf453 100644 --- a/test/unit/facebook/friends.test.js +++ b/test/unit/facebook/friends.test.js @@ -71,32 +71,33 @@ describe.only('Facebook model test here', () => { }); it('Update your friends data', async (done) => { - try{ - const upd = { - name: "Trunk-studio", - email: "hellojs@trunk.studio", + try { + const targetData = { + name: 'Trunk-studio', + email: 'hellojs@trunk.studio', } - let updFriend = await model.friends.findById(friends[3].id); - console.log(updFriend); + rawFriends.length.should.be.above(4); + + let friendToUpdate = await model.friends.findOne({facebookId: rawFriends[3].id}); + console.log(`friendToUpdate: ${friendToUpdate}`); - updFriend.name = upd.name; - updFriend.email = upd.email; + friendToUpdate.name = targetData.name; + friendToUpdate.email = targetData.email; - let result = await updFriend.save(); + let result = await friendToUpdate.save(); - result.name.should.be.eq(upd.name); - result.email.should.be.eq(upd.email); + result.name.should.be.eq(targetData.name); + result.email.should.be.eq(targetData.email); done(); - } catch(e){ + } catch(e) { done(e); } }); it('Delete your friend data', async (done) =>{ - try{ let trunk = await model.friends.findOne({ where : {name: 'Trunk-studio'}}); From 1f34f29a7ac185a5e638d5be2e9011a2a97ee797 Mon Sep 17 00:00:00 2001 From: FennyLiang Date: Thu, 28 Jul 2016 17:45:38 +0900 Subject: [PATCH 13/14] Fix create test. --- test/unit/facebook/friends.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/facebook/friends.test.js b/test/unit/facebook/friends.test.js index cfbf453..83d8283 100644 --- a/test/unit/facebook/friends.test.js +++ b/test/unit/facebook/friends.test.js @@ -43,7 +43,7 @@ describe.only('Facebook model test here', () => { // console.log(`Model: ${model}, friends: ${model.friends}`); friends = await model.friends.bulkCreate(formattedFriends); - result.length.should.be.eq(1); + friends.length.should.be.eq(rawFriends.length); done(); } catch(e) { From 0fbbf46f518aa7a7b4f57d78feb14bc9920ee597 Mon Sep 17 00:00:00 2001 From: FennyLiang Date: Thu, 28 Jul 2016 18:44:48 +0800 Subject: [PATCH 14/14] change find friends test --- database.db | Bin 7168 -> 8192 bytes test/unit/facebook/friends.test.js | 18 +++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/database.db b/database.db index a287a82f4b8283403289d3deed128af45b570652..4cbc4c2c8cfc7ba1bd28ada0da9e783bb376798a 100644 GIT binary patch literal 8192 zcmeHM-EZ4e6u0BF=?5Lqj#a1+H9|dP(l}Ivy!H4l}8t^aTl{R>EZ+g zJarYIZqn%Z+=NC!Q=t>mRMetv;!EO7mDLbIh|DaOabzezvG*C-g0sOpS?Kgk9D|^+L<;4M((He`cHswRd#T zvu(Ee$-JRwQ>Ie{YSbm2+Pz@52j7^~CiGLe+?nWh@9^RdRxk#byOzoI%%9BNKrj6( zJx#Y!-%?h*-)}n66r!G>dZN*>QFctrvPaCKEMct3gh!&p3rOG)miiFs<75`2LjwGz zgG5l+9)u1dq#Kt@75uMiCIh@86ucd1%m9s75) z<<;Az#g7z(cuaVS=ds9%*uA;CRIPKAudl3@uFsV(F3Ok(Y($t$UcxYR4|A#p9p!6_ z=gaSZSz5YAWLXp>i6b&6V4iqU4p9v5_;fTnQqVIQjU6bavE^e3RPzFKz#~tydNN?m zD(D~93wj>B-OzGY2OJ^140gy8uXsY|7;SaX8I2C)VI5%m)36Q^PUd8UWNGinKv*~I zhb+|80y)k6LBZcoJ_0@h4=@6)G}BQ(nQw-Ic3xHvSn*%;R{sFo@0;c$;3H6rfFJ+0 zc=%U70{&+fo93QY920Fbq6= zZp=vn2V^J^tylnBcNd1=ozhg>sw?7$UsPr;ly2RGZ3RUDmKE_FM=fUFG5xkRje5lD(BqFa4r z6ZSi|J}xiL%ZO750o6#9VJE=dc6X`za21))KDqP5%KGF3R`sFH s!LO}+P@4Z#K_Z4100|z`3deck{?+DtlrOwjy78_vatyx65pS^n1yX0WumAu6 literal 7168 zcmeHLe@q)y9Dnbw9NWzN!x+)O6u1`{3^V=F*kHF9d8JgluA*35SzKCyv=vnkS5#>$ zODap(qav-gN~=}2nuN(j-~RAk69w+WG3|}WPJ2)-=T~-9wwi=f;jbo#FW6H-^)0OX z1=QeTUCM6CRtfy+aC@T+KCoMC-zT>9C_5=z&BElBKYks%csB*^$KY$}7a2D)v9xEK zvY)cmD17n5cb~odX_>sz4|c}Kj)|eSl)aR#Mq%R8@TpkOL#ddF=$Lr0Bfcx7?4@iq z3enKduXmqanTi<;b;g4S#G(DlUdmQeu>1I#@z|?OYUdkx#_gt2jbGKyn}gl6v8n#S z9jR@qXL!bkQ%8OC9n%jPS=iFVXkTpKKnL*Vq{M1o)T5QD!ni8UYS56Pjy|fy4 zAo&}>pX`-oAj`ll%)lLx%%|j65%9nxPr0V*{*=yt+FSiCj6Vx4%RrWabOy5LKb?>S-v%5M`5xR19ApzQN|IOu7=uR$3a(VoL+`4P!kgvKaQXKYxMiu z<(QovGlN};ld3ie6B@XbnCuxTkqJF`Og#E-JP=j0P)qOmBY}%w>nX4Xt2EWL`#Ba% zRDP8*%`(;h^G}6z{#Str01-$K5RSl&V`wX{%m&Qs`V>dzT`Z8G`|9g%P**AM56v1@ZtvK diff --git a/test/unit/facebook/friends.test.js b/test/unit/facebook/friends.test.js index 83d8283..86df71b 100644 --- a/test/unit/facebook/friends.test.js +++ b/test/unit/facebook/friends.test.js @@ -10,7 +10,7 @@ describe.only('Facebook model test here', () => { before( async (done) => { let userId = "718145738235098"; - let token = "EAACEdEose0cBAKwxkCTHTxZCt4gFmqgCJ79QZAtnzUrg2gaibUqFWZAY3BEBrqOedhc96FB6w6EsIuXpGvOpZBzoUSGVsu8mGGw9GCZAZAV9CTj64JL4NOPkijgVL95DZAr0EccRSbc5rHDHLNZBnup7WK2aFkOFAs0g5QzPUSya6QZDZD"; + let token = "EAACEdEose0cBAAf3LjhVUNt2RFiaLwAeYKEutSUjb707wZABVylwox6CeZBW5kSvCZCAQM2Dg5PTeFk67NvmCzBTYWEaAMgJKXmzx4sWDFUAtlKP0pe7HoauD5cH8kAp3NaExlLbmtVqrqf1QNZCOY3tfTs10CYibGkzAeojLwZDZD"; facebookHelper = await new FacebookHelper({userId, token}); model = await task1_initModel(); @@ -55,12 +55,20 @@ describe.only('Facebook model test here', () => { it('Find your friend', async (done) => { try { - let resultFriend = await model.friends.findOne({facebookId: rawFriends[0].id}); + let resultFriends = await model.friends.findAll(); - // console.log(`id::::::${friends[0].id}`); - console.log(`result of findFriend:::${resultFriend}`); + let dataFbIds = resultFriends.map((resultfriend) => { + return resultfriend.facebookId; + }); + console.log(dataFbIds); - resultFriend.should.not.be.eq(null); + let apiFriendsId = rawFriends.map((friend) => { + return friend.id; + }); + console.log(apiFriendsId); + + dataFbIds.should.be.eql(apiFriendsId); + // resultFriend.should.not.be.eq(null); done();