SE-Row-1 · z1yoon · Nov 10, 2024 · Nov 9, 2024 · Nov 9, 2024 · Nov 10, 2024
diff --git 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
@@ -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
@@ -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[Ù
+Œ	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

diff --git a/envs/account.env.gpg b/envs/account.env.gpg
diff --git 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éó
+Œ	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

diff --git a/envs/ec2.env.gpg b/envs/ec2.env.gpg
@@ -1,2 +1 @@
-Œ	‡Âh9Cå”éöÒÀŒç¬‡Õ²–KKXœƒYÎ{\*ð*jt¸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áMsr»GøjqiePšœátŠ{¾Åh³'veÄgËPÆ=ÎÑ’ÄBô³f%Ï¥"ÚÖ¶øn.¯Uªe¹gèjý¨¥ÊmîÌ3‘¸x1t&t‡¡\¯ïÔö|Óñ.·©h!·z3i%ëáb©<x‰Õ*ã`žÅü20IMüANuîpºpÁQ’-)•PëÌ û
+Œ	‘¥ÀvF)ð‹öÒÀˆ5‡üz×~€_ÛêEX»64ò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ÇÖó

diff --git 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éšÿüÍ¯ú9n’¢ÀÞ¹½è[«JÇí=ÑEa
+Œ	ÁæIðb?~öÒ¡Ô!ÚÍœ¯Ž×F¥\»¶÷”)“t·‰ê_¼‰Õ‘÷¬ÔÉ¨C\Æ³2õ6cß®kdtùJ¨°ºÊ¥þ³Yäˆc&47B,SRrHŒP©fÕjœÜAjííÙƒãX3[T¸Bº 5?>ãÁ¾šã—§}ýÏ:êÞ;«•H)UéíVk³¨ísMï¦IÙù—«›±(É¤„3sQ¹C

diff --git a/envs/item.env.gpg b/envs/item.env.gpg
diff --git 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)Ñ“¿˜Ry›G©Oš ÙÚ„=	¡DÁ	¦Æ.O´àPZ
+Œ	ñ)¦úµ²¼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

diff --git a/envs/rabbitmq.env.gpg b/envs/rabbitmq.env.gpg
@@ -1,2 +1 @@
-Œ	âƒ˜”5œöÒboÛ/s2Ïc·y_Iá$PèU…/±4°ê¯9²Äâ]lÉ\EÎ
-÷a\²”sÅ›&BÁô¸¨g’‹b¨'·i|xEâ.±K*9Ü=]“fA7„ÅÇ]íÂ¾T:¶]
+Œ	bQž‘qXo–öÒb^o¯¸«húúq40¦c¶ê§y‘ê¿xŽšŽz·UowÏæ8ÑÜþmAØsßë÷à¡pl´vp ÔÏÈM¶Xú¾³_i@ßÂ=@?†äáóÃ^î)J=¾ºGÿ,–á‹

diff --git a/envs/web.env.gpg b/envs/web.env.gpg
diff --git 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Û}•;æ_
+Œ	ãÔ†:y½¦öÒ¥ŒNvYŒ@×hüÚ]ßxj‰YW›·PV—‡Rª½FöÉ0<A_ÓõnA¤šv/°âx²
+dù³·äæ„–ÖÄ7R‚5 „Ux1U¡Zj‡ƒ¥'—ãð½b$9ÑFµÔ~*Ÿ°µt¶Š+–/wbçFÅµ¥ÀÏà³9g…Æ‰$‘‚°MýuKLÅº=RÀ\ÛÀ›Qy±"Ôð#

diff --git a/envs/wishlist.env.gpg b/envs/wishlist.env.gpg
diff --git 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
@@ -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/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:

diff --git a/services/wishlist/pom.xml b/services/wishlist/pom.xml
@@ -42,6 +42,10 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-validation</artifactId>
     </dependency>
+    <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-actuator</artifactId>
+    </dependency>
 
     <!-- JWT Dependencies -->
     <dependency>