From ef320d616905b44520f6aca0a150f6261db1228e Mon Sep 17 00:00:00 2001
From: z1yoon <83934144+z1yoon@users.noreply.github.com>
Date: Sun, 10 Nov 2024 14:47:42 +0800
Subject: [PATCH] fix: wishlist restarting issue (#70)

Co-authored-by: MrPhotato <chenzianhhh@gmail.com>
Co-authored-by: amber <>
Co-authored-by: nshm <nshm@u.nus.edu>
Co-authored-by: MrPhotato <137085785+MrPhotato@users.noreply.github.com>
---
 .github/workflows/gitops.yaml                 |   2 ++
 argocd/argo-locust-app.yaml                   |   2 +-
 argocd/argo-nshm-app.yaml                     |   2 +-
 envs/account-postgres.env.gpg                 |   3 +-
 envs/account.env.gpg                          | Bin 295 -> 292 bytes
 envs/currency.env.gpg                         |   3 +-
 envs/ec2.env.gpg                              |   3 +-
 envs/item-mongo.env.gpg                       |   3 +-
 envs/item.env.gpg                             | Bin 449 -> 445 bytes
 envs/notification.env.gpg                     |   4 ++-
 envs/rabbitmq.env.gpg                         |   3 +-
 envs/web.env.gpg                              | Bin 129 -> 129 bytes
 envs/wishlist-mongo.env.gpg                   |   4 +--
 envs/wishlist.env.gpg                         | Bin 311 -> 307 bytes
 .../nshm/templates/item-mongo/deployment.yaml |   2 +-
 .../templates/transaction/deployment.yaml     |   3 +-
 helm/nshm/templates/wishlist/deployment.yaml  |  28 +++++++++---------
 helm/nshm/values.yaml                         |   7 +++--
 18 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/gitops.yaml b/.github/workflows/gitops.yaml
index d899e94a..06c378f4 100644
--- a/.github/workflows/gitops.yaml
+++ b/.github/workflows/gitops.yaml
@@ -38,6 +38,8 @@ jobs:
               - 'services/transaction/**'
             notification:
               - 'services/notification/**'
+            transaction:
+              - 'services/transaction/**'
             rabbitmq:
               - 'services/rabbitmq/**'
 
diff --git a/argocd/argo-locust-app.yaml b/argocd/argo-locust-app.yaml
index 4a5f9bb0..2e1ce825 100644
--- a/argocd/argo-locust-app.yaml
+++ b/argocd/argo-locust-app.yaml
@@ -7,7 +7,7 @@ spec:
   project: default
   source:
     repoURL: 'https://github.com/SE-Row-1/nus-secondhand-market.git'
-    targetRevision: NSHM-134-Add-logs-to-wishlist
+    targetRevision: main
     path: locust
   destination:
     server: 'https://kubernetes.default.svc'
diff --git a/argocd/argo-nshm-app.yaml b/argocd/argo-nshm-app.yaml
index 110e1cfc..7b1ba1f4 100644
--- a/argocd/argo-nshm-app.yaml
+++ b/argocd/argo-nshm-app.yaml
@@ -7,7 +7,7 @@ spec:
   project: default
   source:
     repoURL: 'https://github.com/SE-Row-1/nus-secondhand-market.git'
-    targetRevision: NSHM-134-Add-logs-to-wishlist
+    targetRevision: main
     path: helm/nshm
   destination:
     server: 'https://kubernetes.default.svc'
diff --git a/envs/account-postgres.env.gpg b/envs/account-postgres.env.gpg
index 83b82305..73b9dc17 100644
--- a/envs/account-postgres.env.gpg
+++ b/envs/account-postgres.env.gpg
@@ -1,2 +1 @@
-�
	aXO򐔶!�ҋ
�=u��'u�S�C2���&	g
-���L)�g���R�Jh�;5M���v
���}E�h�<�4�TSC�NX��3t]��闗�oq���#����ez�%�;��]Q'g4����%hD����zҔ��[��$�Vg�E�s[�
\ No newline at end of file
+�
	ao)�{k�ҋ
��ş���k�2��%y���'��Gh�Y�xD��/����P?"#G���dZ���6��3�H�6�-�v�O���#��8]NU�+2R��!�<�:Uѯ�<���%�?T��#FmI	����W:��Ҵ��_u�-K
\ No newline at end of file
diff --git a/envs/account.env.gpg b/envs/account.env.gpg
index b5237d4daec35a86da4d4a4e703ed38f8fc858a9..39dbe261e519078c399de3ae38025978f61e055b 100644
GIT binary patch
literal 292
zcmV+<0o(qJ4Fm}T2yrDxVXk7(Blgn3QURXm_l7vw9qo!@FmU5OOMu4)c(>z(4Rhm-
z*ww#K%pRzMAyIWjNC$EW5Ysen0vx%MgcVW{GnEFW7M%%de~!f9i#qf&`RRwAoCEgT
zHu7b30iEwL<`H9=n3(*RYT4w*?qSuO)7xy)+5F?+G(3ZXvE27XdE@)q_gOFw80-h5
zlw$A1b?vKw2%N^$-5I<)nogXkyTIZ<Vm(E~9wtf_D@<KD@b7T1qul2HO3S*n`5a)_
zG$!@s#xZb0QXRmo(%86VYVUBpX86RmYU&$OjkBq-iwIvuUSVOf$+kdd>qlh0k1X;U
qBk*0)@=SvJtI;><Y!`1RHfPOCJ3^O!&7tR$LSboFaX-T1ARtLb^_IB+

literal 295
zcmV+?0oeYG4Fm}T2x|xB48J~N4EEB%RRIdnO2K1>go|}F1-i8WQ{gx1u^9{o23^yL
zEFmU3hY-=6;Fb+^CIuvj?`>tQgOLC-=GMC(od5OFPjMH3EW+$>Au-gHkAL@etHHeO
zJGT!@Pm}AdJ%joPsUcjW&8eiE%Kf*P<=q}91n)Q>XZbk5`awaU)gbk3p0bg1ajK@u
z#1X20X_3;WdV;7|+-{boDM+9@<_=}TGNeImGGG+{cWaF*HI492rQU<}=n2$5vc!IO
ztd_XI#e%DGguj$G*X{_6rGx=Cc)&^xJeN$6w}uvmd0&~n4;y!4pDfwo*|C937eHi;
tB?QY9Ea&kEoPf1ZUWtTu1uVZhjATO=2^%T)leV3|hv^6wJY=PFaZZ0vjJN;*

diff --git a/envs/currency.env.gpg b/envs/currency.env.gpg
index 7121d74d..72ed4ef1 100644
--- a/envs/currency.env.gpg
+++ b/envs/currency.env.gpg
@@ -1,2 +1 @@
-�
	S�^k����j
�"���A�9���_{��'�[s��UTú��Q�!r�1kW7���Wm�� 'G�������00DN�.
-��z�Հnbz�P�%`���!Sܞ�y��
\ No newline at end of file
+�
	K_�n��,��j
>�Ml�%T�$�OL�,�d�t�Y��"ȼ��-�R�O��c@k�L�حL.�h>|��=��Kq9c0�A��s&�v�S�`�*��;5;bu��N+l�
(��E
\ No newline at end of file
diff --git a/envs/ec2.env.gpg b/envs/ec2.env.gpg
index 1894fd11..03df8642 100644
--- a/envs/ec2.env.gpg
+++ b/envs/ec2.env.gpg
@@ -1,2 +1 @@
-�
	��h9C������
笇���KKX��Y�{\*�*j�t�T�|I�	z}���El�\���X���Xu
�͋��
-�-�a��k��a�{���A���3Fj�Z�a����
��߇7��j2sPno=�`1oj�"Ɉ���	�	�E^ו>���"/��'��v�<A�+�K/9�&fq�4]�Hd��!�e/��u�M�sr�G�jqieP���t�{��h�'ve�g�P�=����B��f%��"�ֶ�n.�U�e�g�j����m��3��x1t&t��\�����|��.���h!��z3i%��b�<x��*�`���20I
M�ANu�p
�p�Q�-)�P�� �
\ No newline at end of file
+�
	���vF)������
5���z�~�_��EX�6�4�J:�H�w��|�2�=v*I�X��J.�c���v�l/&�",�J�))`\��t�|
X�<��+�Eu��@�x�q�wj�)�c���/�u��kvX�N�9�{{В��`/���M���/膹9LcA�
l�-�+�96qt�o+��ݗ�ƅ����ܾ{��k!:����D^|�' _�L���s5��h)
�=����8�e�Ȓ}���R���v��v��s�G�(6�	F�J�w�-����M��
W[����xĞL��'-�x�*�0o������3� �.�q�ļk��lL��8��Z���
\ No newline at end of file
diff --git a/envs/item-mongo.env.gpg b/envs/item-mongo.env.gpg
index c3eb1ba0..f703808b 100644
--- a/envs/item-mongo.env.gpg
+++ b/envs/item-mongo.env.gpg
@@ -1,2 +1 @@
-�
	Β��C9D-�ҡ
?-�7�?�nTK&�����IDk����f0���n�M������@��ݷ
`*������7��sU����>��+;��ӟ�m
-�>\Z~! ]AЧP"z���s�B��ʩ�Q_�m�b����ͯ�9��n����
���[�J��=�Ea
\ No newline at end of file
+�
	��I�b?~�ҡ
�!�͜���F�\����)�t���_��Ց���ɨC\Ƴ2�6�c߮kdt�J���ʥ��Y��c&47B,SRr�H�P�f�j��Aj��ك�X3[T�B� 5?>����㗧}���:��;��H)U��Vk���
sM�I������(ɤ�3sQ�C
\ No newline at end of file
diff --git a/envs/item.env.gpg b/envs/item.env.gpg
index 440d48d2a609fd3aaae7fb5fb022dc1e3617101b..7f13de0d73685f225078618055747d6d02ae1831 100644
GIT binary patch
literal 445
zcmV;u0Yd(a4Fm}T2zeq{%-a0@3ii^#>jC`330&2{S2Fker<lKAmpI@Q_FS;NA`_Ri
zHsB%R`Y>ALJ6OS`TNFIaC7FiJZ`ehbU@T~n1c~tB2>01X8VO)vFHpcT0y3`vU*&xN
z#1~J27=+r6{VPAeY@z*!Kd2CyLEN1&`(>{w3)TZQ;Q9AxZI+w!Ji4`b$)$Ze<M>fx
zQggL_@pKJmQlN$s@&7#bL@*Xk_?FYUB<xeLhSIafI|n8&vmsdpM{!ufal+0n>MRfV
zX>1SDla~c#EMBS)Og@ZS*a8iTnt)qHqfoU|EJX@s(=BfqJ;rf@Rshaf5!~@x-DBL%
z(>QV}vuS0=_)lZ=lH3WisEy+Udd2}mX*^D&Ss##W5Ub#EM)FDU;eEj+&gd@K&)|>S
zfCq#&BD$MsHgJ3UMZ?*ZmJD0e?R<V3&?PXBSoY)#)g8fqRTPyhru=VAQ4@=8y}P46
zNX;Us=yUXMDYaK<ydu87e?^)-vTGF8dTL9N++zXAsKtB+LH+@g=F8=M;RKM#SWUbJ
n^`bA(-jrzJ;--Yj>~4jZ(_xorG(wY3b`D=lx**0VN10#dOnluh

literal 449
zcmV;y0Y3hW4Fm}T2>L#xKUhZR81~Y@?*aJ{&T1|WB@4~eWg4_%z<xsDqBjQkVWHt0
zC+=!x6^i}$1W34!SFa;mT(6e~FR1wCd`7^XVLzemU4kzQIYyd!mxmvjqlg%XAP=-1
zFtv=C;#bp?R~Jlsy8^%sqSyVPY^7AW@3Q<|#YF7d*96Jo#A^{*EtzRY&m!PEV-~WH
z5&NXV^Mzeo3dNjm<v+uRbsF%lS?zUe!*dnRR?jiIKhksHax1a~GuC?V$mPh-=BS%I
z9q@TXRcABpf2rw_CFw-tOUBc)HlZra4u31#f=khm0OxG2MAyb4@I_-f_-*b5J!W#k
z<iMZz?#tto*mvEcbI9FyqVJ&%F496c1bVhV1JRb<$;=&}v=04~P5^Nh17ug7e(>r~
zu%)||O)ofMdv-V*^1-{y-*cKa2eD)z?x=A(Ri{|4l-$+wad|l$aM?PIpJHx-mXVtY
zV7>+kR^(dz$Sxf>9*@Q6_XCq3NHgQ#2x&qF?;KV;=Cm*2`R5zkR&`X5aunfhOeMvk
r#tcv-cqT5Hzs&8aMNWExaq)EmU3)|v8g`^+hc6#8KBQQ$&sm(}Ff-rw

diff --git a/envs/notification.env.gpg b/envs/notification.env.gpg
index 02e79ff3..0f24af1b 100644
--- a/envs/notification.env.gpg
+++ b/envs/notification.env.gpg
@@ -1 +1,3 @@
-�
	3y�ۊ�<K�ұ
��ҽ�4׬DEx�����t"���a�KCg��*L��H���'b2Q|je݅%F���<�����
��/wٱ�tض�����Ht�U��=��.�dn��y��sI���}w�F����z�cs��P�=i���!Du)ѓ��R�y��G�O���ڄ=	�D�	��.O���PZ
\ No newline at end of file
+�
	�)�����2�Ұ
���~G.Azug��^�j�>�#vl��ݑ#:eJ}:g��z8�����er
`�G���~�OW���LO+0I��N8�
+��G���yk�K�>Z��™���Ph���/�խ
�3%
+_5>��7?x3�H��
s]�Q�� �~��@��Q���#�ܝJw��)]ޑ��@�gL
\ No newline at end of file
diff --git a/envs/rabbitmq.env.gpg b/envs/rabbitmq.env.gpg
index 589e95ec..ba2ab910 100644
--- a/envs/rabbitmq.env.gpg
+++ b/envs/rabbitmq.env.gpg
@@ -1,2 +1 @@
-�
	⍃��5���b
o�/s2�c�y_I�$P�U�/�4��9���]l�\E�
-�a\��sś&��B����g��b�'��i|xE�.�K*9�=]�fA7���]�¾T:�]
\ No newline at end of file
+�
	bQ��qXo���b
^o���h��q40�c��y��x����z�Uow��8���mA�s����pl�vp ���M�X���_i@��=@?�����^�)J=��G�
,�။
\ No newline at end of file
diff --git a/envs/web.env.gpg b/envs/web.env.gpg
index 3d7a2fb58d089dcbb79e6967a08c33e5da3d8ee1..6cba34453b83fa6b5ccc01671aaaed80b335191d 100644
GIT binary patch
literal 129
zcmV-{0Dk|B4Fm}T2%&<M?s(4C9QM+10UYmbg95HHQrjmsRyKy4H6gupm&@vg@Pp@G
z_)TteVPuCHhNpHsGwbyA4+hfy0NeFiTsOS8rLylxY6VEYAxI-}^JRcq%)o-cOx{Hf
j{t}P6SVEzmJY*}g2yc;qzJ4gASo@~L(u~1%26q~ijBh@y

literal 129
zcmV-{0Dk|B4Fm}T2zk@}{ZE*(dG^w90Tp-R|B}G*haKNZ?adkM1oK4cJP0tS+~l)d
ztdQ^BSWr}>h*IN}?EdNt1$raxum0%Uyu!Y;&c-XHDu1$SLV}1w-e8c7M7N2SGd@WJ
jX;@A_e!$`>QOl$D`y$Z4P}Ltd{Qp=1wPg<$fH#t*lFvjf

diff --git a/envs/wishlist-mongo.env.gpg b/envs/wishlist-mongo.env.gpg
index e264993d..8cd4e9f2 100644
--- a/envs/wishlist-mongo.env.gpg
+++ b/envs/wishlist-mongo.env.gpg
@@ -1,2 +1,2 @@
-�
	�c�!���v�Ҧ
�	����3=7W|\��]���NzgsIm��Bp��(@8
-���ą��6a{�]�\`�C�3f�R�z��0il^-~s����qulq�����'�6�ˆ�V��-���������0��k�SM�E;�@WX�3۾��õ佶���L
���?P��j�}�;�_
\ No newline at end of file
+�
	�Ԇ:y���ҥ
�NvY�@�h��]�xj�YW��PV��R��F��0<A_��nA��v/��x�
+d����愖��7R�5 �Ux1U��Zj���'�
���b$9�F��~*���t���+�/�w�b�Fŵ����9g�Ɖ$���M�uKLź=R�\����Qy�"��#
\ No newline at end of file
diff --git a/envs/wishlist.env.gpg b/envs/wishlist.env.gpg
index 1a2d59ce409cce0405b4869dd39d27398e853051..cba17d20066e674ddcfe9f46000eb5c1d5b8b422 100644
GIT binary patch
literal 307
zcmV-30nGl44Fm}T2%wQ9flI`oHuloMVFCY*fu~hFa6M6fD$O*nP;EVIl?VqDk}=Vg
ztA2L9;Uf=>wXI{2Dz_jd<tOM#a`b<Wtzn1jm3Ni@xEXc8Pi-Zu7MZlMgFX_l(%TW4
z6Wrpjk-Udw8wU>hnj%+wh9R93&-`jtHbGOaF3x_CM?DFi1BsaaKaA7{KSVuzP)nGx
z_vOY;aEW93V8eGr7Cr~f#<>pMjR_U|QU)7kU%KN^$1L_`dJ{VGbJ7)^4v-CjG6Lra
z&bEz|*9d|ok)}2`(Btm#!_!O(Oe7E39wc2)YjUr-8=E}9%gS|yF0!!amtUtf2+-D6
z*kel-Gh_N07pDo*M*QFB@)o5e@+Zo18bc=13=Bor0OP|kDzzuDgg$GfF#eu|7Qutm
FPq-MikBI;P

literal 311
zcmV-70m%N04Fm}T2ot0f8@5l4D)!RAWdUJeK5nJbXcXe|o(|O1W&I^l?L~RK!+hsS
z#@t5$CmcM18?KV^8W}x)wEBgdKSi7KS9EJW%rL7rx@Fu*;N>S?l{uR;=Fes^YO$($
zI|V;q1d;nh{SnFu6U!jcv~l|*HYvLOBI0r`79R6rR6qCbq9E|Vy+@j}Ow58VZ84^T
z_4+LZV;pUu?&0{{99f8jFwyr0J7LVdRwOmg%#;)WTEXR_v1&Ndb>o|)Q)qlVgjdY~
z1lg6J1`oMGdL;wO^T2>HYim+FvhP(G1u?n(w`6go{C_FQ^ZMiCd2}nb`D~2!NXN@s
zy@}HrunVp(!v6uN<Q$gUF!8x=3$cSDgiv4kj1im;MCvimX``@QAMsV!WbaT>I8WX$
J6Xf<mhcT1Xn8yGB

diff --git a/helm/nshm/templates/item-mongo/deployment.yaml b/helm/nshm/templates/item-mongo/deployment.yaml
index 5b201145..e38570a6 100644
--- a/helm/nshm/templates/item-mongo/deployment.yaml
+++ b/helm/nshm/templates/item-mongo/deployment.yaml
@@ -20,7 +20,7 @@ spec:
           - "sh"
           - "-c"
           - |
-            git clone --branch NSHM-134-Add-logs-to-wishlist https://github.com/SE-Row-1/nus-secondhand-market.git /scripts
+            git clone --branch main https://github.com/SE-Row-1/nus-secondhand-market.git /scripts
         volumeMounts:
           - name: init-script
             mountPath: /scripts
diff --git a/helm/nshm/templates/transaction/deployment.yaml b/helm/nshm/templates/transaction/deployment.yaml
index f4ad38b2..56a9e192 100644
--- a/helm/nshm/templates/transaction/deployment.yaml
+++ b/helm/nshm/templates/transaction/deployment.yaml
@@ -30,7 +30,8 @@ spec:
         args:
           - |
             export PGPASSWORD=$POSTGRES_PASSWORD && \
-            psql -h $DB_ENDPOINT -U $POSTGRES_USERNAME -d $DB_NAME -f /scripts/services/transaction/database/init.sql
+            psql -h $DB_ENDPOINT -U $POSTGRES_USERNAME -d postgres -c "CREATE DATABASE \"nshm-account\""
+            psql -h $DB_ENDPOINT -U $POSTGRES_USERNAME -d "nshm-account" -f /scripts/services/transaction/database/production/init.sql
         volumeMounts:
           - name: init-script
             mountPath: /scripts
diff --git a/helm/nshm/templates/wishlist/deployment.yaml b/helm/nshm/templates/wishlist/deployment.yaml
index 0d85c0d0..565a1152 100644
--- a/helm/nshm/templates/wishlist/deployment.yaml
+++ b/helm/nshm/templates/wishlist/deployment.yaml
@@ -26,18 +26,18 @@ spec:
         envFrom:
           - secretRef:
               name: wishlist-secret
-        livenessProbe:
-          httpGet:
-            path: /actuator/health/liveness
-            port: 8083
-          initialDelaySeconds: 30
-          periodSeconds: 30
-          failureThreshold: 3
+       #livenessProbe:
+       #  httpGet:
+       #    path: /actuator/health/liveness
+       #    port: 8083
+       #  initialDelaySeconds: 30
+       #  periodSeconds: 30
+       #  failureThreshold: 3
 
-        readinessProbe:
-          httpGet:
-            path: /actuator/health/readiness
-            port: 8083
-          initialDelaySeconds: 30
-          periodSeconds: 30
-          failureThreshold: 3
+       #readinessProbe:
+       #  httpGet:
+       #    path: /actuator/health/readiness
+       #    port: 8083
+       #  initialDelaySeconds: 30
+       #  periodSeconds: 30
+       #  failureThreshold: 3
diff --git a/helm/nshm/values.yaml b/helm/nshm/values.yaml
index 08acdaaa..6e40b4b9 100644
--- a/helm/nshm/values.yaml
+++ b/helm/nshm/values.yaml
@@ -30,7 +30,7 @@ item:
 wishlist:
   image:
     repository: z1yoon/nshm-wishlist
-    tag: f617eba726b60b6351b305e5b5b92b8633e85682
+    tag: b08938b837bc2fb554f3f07bf1e3493f15ff20c8
   replicas: 1
   resources:
     limits:
@@ -72,12 +72,15 @@ notification:
 transaction:
   image:
     repository: z1yoon/nshm-transaction
-    tag: latest
+    tag: 32458c0dfc2c3059ec22d610d55482611530183a
   replicas: 1
   resources:
     limits:
       cpu: 500m
       memory: 512Mi
+    requests:
+      cpu: 250m
+      memory: 256Mi
 
 # Rabbitmq service values
 rabbitmq: