From fa9f2e6fe2f33afcced7dc4406d44e3831e6f240 Mon Sep 17 00:00:00 2001
From: oshianor <abundanceoshianor@gmail.com>
Date: Wed, 23 Nov 2022 14:23:17 -0600
Subject: [PATCH] Fixed onboarding and set currency

---
 .gitignore                                 |   4 +-
 database/__pycache__/mongo.cpython-310.pyc | Bin 749 -> 723 bytes
 database/mongo.py                          |   4 +-
 logic/__pycache__/coin.cpython-310.pyc     | Bin 2961 -> 2965 bytes
 logic/__pycache__/currency.cpython-310.pyc | Bin 1837 -> 2610 bytes
 logic/__pycache__/help.cpython-310.pyc     | Bin 2259 -> 2417 bytes
 logic/__pycache__/welcome.cpython-310.pyc  | Bin 1759 -> 1842 bytes
 logic/coin.py                              |   2 +-
 logic/currency.py                          |  46 +++++++++++++++++----
 logic/help.py                              |  16 ++++---
 logic/welcome.py                           |  14 ++++---
 main.py                                    |   3 +-
 12 files changed, 63 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index ed8ebf5..0e4f7f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-__pycache__
\ No newline at end of file
+__pycache__/
+*.py[cod]
+*$py.class
\ No newline at end of file
diff --git a/database/__pycache__/mongo.cpython-310.pyc b/database/__pycache__/mongo.cpython-310.pyc
index 2f808efec1b354e96e98318f49c5835825b1b9fa..79e20e08031ebb35693de8a1a603ca7bd3e1b923 100644
GIT binary patch
delta 85
zcmaFMdYP3spO=@50SF$~)Fmrz<UPfx$^_&&1934(yoMo*A%#(rA(%mv$uEjMIU}(o
hDZfIKak2=LHXBGK7t>^SCObyX$@`haC(mUH000P;5!wI%

delta 107
zcmcc2`j(Y9pO=@50SGKFS0^iM<UPe`%M9c>197n!kSJkDVXR@uVr*t&WB}1AOp*-2
z44TY-MJzzsDE8!x#FC`^3QeY4tOZ4xc_owoFluvvq<9#)7$@s8*)eiW&S6Ri0KGpJ
A%m4rY

diff --git a/database/mongo.py b/database/mongo.py
index 87b7bb9..e49b94c 100644
--- a/database/mongo.py
+++ b/database/mongo.py
@@ -3,9 +3,9 @@ import pymongo
 
 class Mongo:
   def __init__(self):
-    url = "mongodb+srv://:@churchee.qbavh.gcp.mongodb.net/?retryWrites=true&w=majority"
+    url = "mongodb+srv://chatbox:chatbox@churchee.qbavh.gcp.mongodb.net/?retryWrites=true&w=majority"
     self.client = pymongo.MongoClient(url)
 
   def getClient(self):
-    print("client", self.client)
+    # print("client", self.client)
     return self.client['chatbox']
diff --git a/logic/__pycache__/coin.cpython-310.pyc b/logic/__pycache__/coin.cpython-310.pyc
index 7635b36f77fc1f5c8531a02a0fea19c05bf54b2a..a7d2256ff5b4a9d3e0597fca8bfa4bed4c88d36a 100644
GIT binary patch
delta 96
zcmbOzK2@AIpO=@50SGQs)g|+6<TYnEuwZ0hs9{*Zu#lmasfH<qQIa8rNs_^ZAy%-K
xxrRA~S(0G^<3ffSMi80JR3yE*fZc?dTZEB|k*R@$iHDJ6@<uNC$>+EZ0|4fO6+8d{

delta 78
zcmbO#K2e-EpO=@50SFG4*Cw-U<TYp4F=1q2s9{*Zu#lmasfH<qQIa8rNs_^ZA(p?E
hxrRA~S(0G^<3ffS#%!h{$;~C~Cd`ZilUH)R0RWL{5w!pS

diff --git a/logic/__pycache__/currency.cpython-310.pyc b/logic/__pycache__/currency.cpython-310.pyc
index 99bb91e8291eb825c153915ac06dccdb64c2aca7..a38b1ccdf0f149f6bee8e8ad90613f4075a61ee3 100644
GIT binary patch
literal 2610
zcmcImUvJz*5clrcKId{t(=-jF1z}J{IYI7nO&XGdP^*+b5p7h_Mxd+E$?@(bPJQ-e
z?Q4719YRW9dEpWDA$jDJ@E!ch6JMbZh~L=faH)Vd*4pvT&Ukir<~OqrXJ#rI+Ha#D
z-1d~F{Z7neD}lL<9@RmFCYZ0a@;7TS@Z9I!Qme$YFEvpT`U_3y$GoKr_E4)Cf8ZN!
zr^Zs_ei-bBF0qr1gSm|!t$|3547Rvng1^vOrQ94$8Nvi_h_bNoHpP^v;9VBeSfZL*
zTYaTu;0{~{BSoVzZG8)Uy!D~h#>PRJV4z%ZTHz(fxI}A+ayHh52D{cyvT+c{z35h>
z;f7wIoZyKU>^JMZx^jA+K(D)Dx1nT5(&}>A&9~vnD7_)&UeoO~*EiO>(ZR;*=EhCg
zS?R27G{xqPUi0IdYeF1G!TRP}v$J}mBUeQ;x%wZg)Oa%c-SRiI?wtqQ%U{bua$$o1
zDvaV5UtLMrN{y$6?{&R6HN#FPl5x#QtK*#wcATzED+RZGH!by*pOz1#BczJb>7%|>
zgD6%wCqkx2((nALsabgN)fbK32s({0I`EtzRE@i#+waOCjv74`9!eJjH++f-HE6g8
zPQ1JqK5zKpzUMZI1?#;*YPH*5;Kl8>NpT_5CZmUQ&a6M@^yK2!IGXiB^ITXdqy~Bx
z*7q@pwL=8+5J5aFp#yh6l}0Q!PRt=YET6IwA993~@6@=OhJI@H9OZPQnw45g;>1xL
zrKNotD@ub*MO8^pKa9cv&I}z9rFtx%$F-80AxY_}<EOfCVkh%WPA-sS77@DR`^6FF
zFc;B57kQQGEP104)X(ev`w4%+$3yKzJJoO|f-O7dOv8u|nJ6tG*U*h6jb_I)=8|?-
z`+jA_p;bO+nYK0LVk+0dYz5r(8CL~2bH>eryKu(MfxCFd&4as?b4ORi0=#;8CowBF
zc_NvA6vmEkk57msxMiz1$tOk>J8-cPll%;QP)J(K|5vLdb5|cXKUwYW?rz_`b@lN|
z*G~0*-xI}rJm|?{p2o?1uK#e*-3$G(#EdfT)z}tgPw`EFabfGBw;vSq5yr`4Zfm>i
z>`VKe7d#nD%bptsyUKqAC@y8L=^@n$SmoZ*vnoJ&F$pWca{^Y2kVfQNi&fYnn`0K6
zJ$vSu&L@C&{!5qAr)U-iW%MkSe#Riyj<r!~SUO>Vn?6J;EombI@Z;dkp(!}P2G9Xs
zi=*<eOyD~yooYi)^a)oVVh&(LJ=Jq5M#j-)q@@w9Q*x^H*c2v#a%h~CMH!GSFKHeV
z7U^W^JN1%#>=bYo6##5{CoMa!8}?CG=)~$RBJU7+8zi|``BvHx`y#j=+Z`_uwi66&
zcU(j4XI^|@#|P4;fZ2nvZ=+g0^@J34`++Z=NZKe^wzKbeK|M8O*YW&BzeaVFD{_#+
zm8d<cS&D9|bPDd=@;$0@c>w+JnN*ohu6>QPF3~>PVIbQM-u)i(L&8E<JM=!vXr`N*
zZe}UvVlSPd>HDFOehvexIKk@`W*S>7stA?8=n9Al1mNLwYypU<F#cneTkJg!BrFul
z^@$H%I!w{1KAlxm0Vab1s%8cQz#)SH;BbNq69EGV5Fj=(VqDNegFukgBwV53ARTii
zI0SdhS>VPMXdGB|9c!r%h}cBl1xYUEsq;C-A<vp*A)hMFk<VrxOqR}z?7y>p95y`*
zo2tQdY86pY6r`G&#Y25WOD_|l-y78c$%FCva}PJ+Yl%2b@gHMr6ROcXNbdc4KFjkg
zJm>X^4|eFvX}1Z9?RHvex4WU}`!ue$+edxJ&n1d(jSOCj0<4-u==W%1GugK2#!<z6
z7}1?&p(0on%e3aImoiDsP_#p}0Fus9o!$fF>s|U6%Uwg?|C8a=`ZV9(XY?Z#Q7Vx2
IDx2qj0mZX$od5s;

delta 923
zcmZuvTWb?R6rM9XyV<76657(5(n_osx=>4f6)8vyQjolaz66S{nQdIVmpHqrc1eg(
z1z*Fy`q2IWUj%=Ee`68feeeeeBA&Bts#Ry%@65S;GjlE<=H6RYRIQd7uC>EqXH_3t
zOY1ABNhZN(?K25&c)%o=+G{4YW8UTxTFe$-iPjtki?B9+dt0EXJpOcJrJ%!rJt`<t
zyyLhBsY^qaiapO};p1Y??`-6-Ve?$~y}(OyBii4O-Ne?iA8-pQ*>&C)^s?*?@4{5}
zjW4%MRMiv#IdbtVjzXkIj*N4WxG#~crpconI({yslQ^nE;RRI5V>vzVzVC1Km2$(*
zk(KRfpLK?BpUXDI)!BK9(c{EP;#^On#PQo%B%Y3p-QAt-yNz7*`<_gV<f!M8Mlv;9
zN5PZGN8N~vU1~I)pzwz%Q={c|LyC@3rj?z*>AH=FUU-1ElGlmCUFF+cEfiPxlow9Y
zP{nIRC-O$&KY4WB<c~b&kQ`q@Frf_dPy-XJi?0Uad%7@5dHpi8!;v*vI&L)lxA2cQ
z5eDppowDJGCm`V%fDO3hbsU2_+h%*#P#b7c)Y%C?Wdk_iY6*3{&W7T-C8?@LGhN1}
zHXPq?bk1vjNjb|=#~j00E#Zx75y95-@_D1sp&F0TMvZ>qDqBBmu}KuFb8&*YMiB<t
zcI4l+n#LDQvZuJ%LNLMPHBN=%uf)&nOKDzf+NCU*x;Y|u(GEqktX2trkI}^}DXJV*
sET(BR=|s~sD%HY{lUO6(3;_lH?}XgE7eun}yPJR!v4MccXfUJw0*<8BvH$=8

diff --git a/logic/__pycache__/help.cpython-310.pyc b/logic/__pycache__/help.cpython-310.pyc
index 1ba9969c1fabb259d44c48d53a3af4d87ee1b83b..a84b1f7e9bb17232a06e5399f49b8562d897c55e 100644
GIT binary patch
delta 968
zcmZuvJ8u&~5Z>L}d-(4B3J=FhkPZq^2tgr82=RyzNs%;Bq=X<DQ5etSggEE0cNR)?
z#z^K5gp;5F>0Iy+sF0}WY3M9^NI`)_LxIBV*`Xkuw6ouSGxP1-%ziHZ7|AuWS)1VZ
zGJ0BDbM|r_+r-l?T*1QLtI0E9g9F-YR@W;UxR8BLDjaf<$6bfQ3YjSGefd6JYe^~m
z+RpCT)%A_QlOk+MKk#;%E$M-HSZy^z?=Z#-L>Pah?>m5(gal}pQWDaH0qZG5Ks&;4
z#YE(hHc#%KY*UQUBML^Dln9t5lExEctnv^;MsbhJK(Iu6X?NB3#_nCZetB!TA*zAE
z3ajxqc3a<PSVVkY`*ec$^=-M~hkYJyY>B=eG=$iG!AEI6F7uT;$5cl=G>kIJ4{Y}D
zew@10ru_GAenB+0FRnMAEQWWRax<u@D-J)^TpiaOu3$F)z{fi*VhQh&MDLNd2E5Hf
zqf6R)XreVD4fHYrW0T1Th#6uN@gidUSI8iqiS)$6T<({Ktc~o=$Vf6N>teT@L5IK{
z^f9q}1pArlbyATv6mbUWJ=*327bu}B3b_$gtUm);u<NW@kF-cb-%gl~a9EI27~^sg
z9cnO)9z(2(&!e{+=DT>MUp!LG1(FofYDi+MYp^aZ-$Z{;YJ%w$3ro_9zv}Z$n(>tJ
zu27U2Y@$@JS2}3opT^Raic=Ti-0(H_wTAF34!*ZTMvkiJBAN+PW^wEDRv=_7%yZ?u
za;2uA&^VgYxPpcFtvPv04VOI|rz1FKi!vNPKd_jkM$U5azIkoRRar_pO&uuxqsh^0
uC`~V3wo3ShlnVc4Iq{}7eKq|P74pB_zI9`(39W{hrAoj;;}TWMi1r6~Rn@Wp

delta 805
zcmZuv&1(};5Px60`*yRtNh>BK7OaX$=%sj4Q7JSB1t~(Ig`lUrZHY}bb$8<j>=H}7
ziiCIYx;c6j`geHowr4LQ9z2Q%oyn#m;)9v_y_w$(GjHDa)lVz_$nzWmXZ=~$d*jUf
ziDSZT3nbo}z1wIViY`}<s=Ov$p<LyGHI%<g+SS?TZ`xv~dk=w|5JjhyqGe0V(Wc}H
z?U2Xyj6y`DR2fauAj)izk_8^Cxx`AM?`c&LsBY`4d|#jNkC#|s97p{yDdfR8>^<nm
zNt+cS4h9DWees?|uFk}6V+9*t1H~w#;uqtk)?dZ?go69*;BW$D8zjCAkw2Z&oGCWP
z8MuPpGn&#|%t>y{Nye1Ocw$aTCK3y@kusb_nMW+z2h0FlfbRpAfNj9nQ;|!^<@K<!
zbUWa_lNz~=Zk-z!CS@wp_kdn0d2^caa8r58Ib@?pDN7l|hl!iQ(<&b^)bRe|wg6*0
zRfs)L{3)R%tifQF<tp5A6?t_Ik(A`l!t&_t`LheY`QqJcJCUW2%ntj)^au0wTrHCD
zQiVwR!=NzYK@c44v9)uh;DaFSR^lMp9!F6S_FhJHAVxl@wi)4<(m$+gO&6UD<srfi
zT?C0c`lj4yvR7-gMqMf?W4JKMBw)c@eIjq&voQk;F4D>>|J1`(;!5KdC`lw2xco(}
lQj4F`*0#NQqk(mh{=YhfygeML@gTU1e<j9|U4m_`^54^vq?rH!

diff --git a/logic/__pycache__/welcome.cpython-310.pyc b/logic/__pycache__/welcome.cpython-310.pyc
index 91738b7b209b353a88cb111aa1c141c852917df3..f5eeae2c8d47cf8fdfdcb07ff4e09dfde72550a6 100644
GIT binary patch
delta 253
zcmcc5yNQo4pO=@50SNRf>XOabC-NQOVh8e^fw*|p#2d*>HLR0u8Fl1Rcv5)huq<R`
zWT;`TVN2nL@M~FXSc4ff`6ib#eozz+Pt8fr&rMZGN=(jHkd8LAHqO1pl9!m9S|ueN
zZIG)oxt>vM@<gTz%P8j1V3#PK%8V@EDxZLiQcss0O_m~7pq)i*Kq87KxwNP#H7~i+
z52!hc3&!(wnJmWq%0LgOgpHAdk%I|{89A6a82MOOSOgfE7}@@_@N<0SU=jd|vM_S|
gX91FI|0k=ld}Y*{EW`SQ(Qq;&TQ#G~<XW~Q06MNdo&W#<

delta 170
zcmdnQcb}IppO=@50SIO))+W2MP2@Yk#R}v(199<;i8qp&Qg|lYGV1WmVOq$@$dJMl
z%%I6Txt;NY7)N+&PI7*3s=_Unyu{qpDk+7e#N_PB6B)%OuVbp<)nqCHnN!3DBtj;~
zGrv+(0kYT_IT$&ZfS8eknS+Usg@r|ck%^J*KMN<vFAgRFMghjjl`LNwRVU}OK4H|E
O9Ku%3C_niETM__(W+x~B

diff --git a/logic/coin.py b/logic/coin.py
index b9951db..3d444da 100644
--- a/logic/coin.py
+++ b/logic/coin.py
@@ -48,7 +48,7 @@ class Coin:
     data = self.apiAllCoin()
 
     for x in data["data"]["coins"]:
-      if x["symbol"].lower() == coinName:
+      if x["symbol"].lower() == coinName.lower():
         self.coinId = x["uuid"]
 
     val = self.apiCoin()
diff --git a/logic/currency.py b/logic/currency.py
index 3e81b2c..4f4fd52 100644
--- a/logic/currency.py
+++ b/logic/currency.py
@@ -1,16 +1,17 @@
 import requests
 import json
-
+from database.mongo import Mongo
 
 class Currency:
   def __init__(self):
     self.currencyName = None
+    self.currencyID = None
     self.url = "https://coinranking1.p.rapidapi.com/reference-currencies"
     self.headers = {
         "X-RapidAPI-Key": "eeb1cf1684msh83985ef0f081d92p1754ddjsn6941f32fe3d1",
         "X-RapidAPI-Host": "coinranking1.p.rapidapi.com"
     }
-    self.querystring = {"limit": "10", "offset": "0"}
+    self.querystring = {"limit": "30", "offset": "0"}
 
   def apiAllCurrency(self):
     # we're getting all the coins
@@ -31,11 +32,38 @@ class Currency:
       print("\033[1;3mSign:\033[0m ", coin["sign"])
       print("\033[1;3mImage Link:\033[0m ", coin["iconUrl"])
 
-  def setCurrency(self, currencyName):
-    data = self.apiAllCoin()
+    return True
+
+
+  def setCurrency(self, user, currencyName):
+    client = Mongo()
+    db = client.getClient()
+    userModel = db["account"]
+
+    data = self.apiAllCurrency()
+    for currency in data["data"]["currencies"]:
+      if currency["symbol"].lower() == currencyName.lower():
+        self.currencyID = currency["uuid"]
+        self.currencyName = currency["symbol"]
+
+    if not self.currencyName and self.currencyID:
+      print("\nWe couldn't find any currency with the name you provided. Please try again.")
+
+    userModel.find_one_and_update({"email": user["email"]}, {'$set': {"currencyName": self.currencyName, "currencyID": self.currencyID}})
+    
+    return True
+
+  
+  def getCurrency(self, user):
+    client = Mongo()
+    db = client.getClient()
+    userModel = db["account"]
+    
+    userExist = userModel.find_one({"email": user["email"]})
 
-    print("set all currency all currency")
-    # coinId
-    for currency in data["data"]["coins"]:
-      if currency["symbol"].lower() == currencyName:
-        self.currencyName = currency["uuid"]
+    print("\033[1;3mName:\033[0m ", userExist["name"])
+    print("\033[1;3mEmail:\033[0m ", userExist["email"])
+    print("\033[1;3mCurrency:\033[0m ", userExist["currencyName"])
+    print("\033[1;3mCurrency UUID:\033[0m ", userExist["currencyID"])
+    
+    return True
diff --git a/logic/help.py b/logic/help.py
index 20b2391..ffae874 100644
--- a/logic/help.py
+++ b/logic/help.py
@@ -8,6 +8,8 @@ class Help:
     funcList = [
         {"action": "get all currency", "details": "This gives you details about all the currency we support"}, {
             "action": "set currency [currency symbol]", "details": "You can use this command to set a default currency to your account profile eg 'set currency usd'"},
+        {"action": "get currency",
+            "details": "This returns your default currency set"},
         {"action": "get all coin",
          "details": "You can get all the coins we currently support"},
         {"action": "get coin [coin symbol]",
@@ -17,10 +19,10 @@ class Help:
     def howItWorks(self):
         print(
             "\n \033[1;3mPlease read the following steps to guide you on how this platform works \033[0m")
-        # time.sleep(2)
+        time.sleep(2)
         print(
             "\033[1;3mWe've created a shortcut list of commands you can input to get up to speed fast \033[0m\n")
-        # time.sleep(2)
+        time.sleep(2)
         print(
             "\033[1;3mPlease enter the following command below to get started. Goodluck...\033[0m  \n")
         for x in self.funcList:
@@ -28,7 +30,7 @@ class Help:
             print(x["details"])
             print("\n")
 
-    def callFunc(self):
+    def callFunc(self, user):
 
         print("\n")
         time.sleep(1)
@@ -58,8 +60,10 @@ class Help:
               self.callFunc()
           if cmd[1] == "coin":
             cund = newCoin.getCoin(cmd[2])
+          if cmd[1] == "currency":
+            cund = newCurrency.getCurrency(user)
         elif (["set", "currency"] and cmd) == cmd and len(cmd) == 3:
-          cund = newCurrency.setCurrency(cmd[2])
+          cund = newCurrency.setCurrency(user, cmd[2])
         elif cmd[0] == "exit":
             exit()
         else:
@@ -67,7 +71,7 @@ class Help:
               "The command you provided isn't recornized. Review \033[1;3m how it works \033[0m for better understanding.")
           print("Enter \033[1;3mExit\033[0m to quit the program")
           self.howItWorks()
-          self.callFunc()
+          self.callFunc(user)
 
         if cund:
-          self.callFunc()
+          self.callFunc(user)
diff --git a/logic/welcome.py b/logic/welcome.py
index 42637da..a358828 100644
--- a/logic/welcome.py
+++ b/logic/welcome.py
@@ -13,7 +13,6 @@ class Welcome:
 
     # get the email address
     email = self.provideEmail()
-    # newUser = User(name, email)
     userModel = db["account"]
 
     # first we need to find the account if it present
@@ -23,17 +22,22 @@ class Welcome:
     # print(userExist)
     # check if a user was found
     if userExist:
-      print("Welcome " + userExist["name"].capitalize() +
-            " back to crypto chat-box.\n")
+      print("Welcome back \033[1;3m" + userExist["name"].capitalize() +
+            "\033[0m, to crypto chat-box.\n")
+      
     else:
       print("\nThank you for providing your Email. We just need one last thing from you.")
       # get the user name
       name = self.provideName()
       print("Thank you for completing your onboarding.. " + name.capitalize())
+
+      # create a new user record
       userModel.insert_one({"email": email, "name": name,
-                           "currencyName": "USD", "currencyID": "yhjMzLPhuIDl"})
+                                       "currencyName": "USD", "currencyID": "yhjMzLPhuIDl"})
 
-    return True
+      userExist = {"email": email, "name": name,
+                   "currencyName": "USD", "currencyID": "yhjMzLPhuIDl"}
+    return userExist
 
   def provideName(self):
     name = str(input("how can we address you. Please provide your name: \n"))
diff --git a/main.py b/main.py
index 6263086..fd621f8 100644
--- a/main.py
+++ b/main.py
@@ -5,7 +5,6 @@ import time
 
 def main():
 	
-	proceed = False
 	newWelcome = Welcome()
 	# Welcome the user and get their private information
 	proceed = newWelcome.welcomeUser()
@@ -20,7 +19,7 @@ def main():
 	
 	newHelp = Help()
 	newHelp.howItWorks()
-	newHelp.callFunc()
+	newHelp.callFunc(proceed)