From 5e2a2e0e2cf75385bf49acef25caacbb031fd1e2 Mon Sep 17 00:00:00 2001
From: dev-chiefworks <ameye@chiefsoft.com>
Date: Fri, 15 Apr 2022 22:48:42 -0400
Subject: [PATCH] fix constants

---
 app/Controllers/Savvy.php |  3 ++-
 app/Models/userCards.php  | 45 +++++++++++++++++++++++++--------------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/app/Controllers/Savvy.php b/app/Controllers/Savvy.php
index a9859f8..ee93054 100644
--- a/app/Controllers/Savvy.php
+++ b/app/Controllers/Savvy.php
@@ -183,7 +183,7 @@ class Savvy extends BaseController
                 $in["country"] = "US";
                 $in["loc"] = $_SERVER["REMOTE_ADDR"];
                 break;
-            case 'userlogin': $in["action"] = SAVVYEXT_USER_LOGIN;
+            case 'userlogin': $in["action"] = SAVVY_USER_LOGINACCOUNT;
             log_message('critical', "API-WAS CALLED user 10-009=>".$endpoint );
 
             //{"username":"ses66181@gmail.com","password":"12345678","sessionid":"DUMMYSESSION","loc":"172.24.0.1","pid":100}
@@ -276,6 +276,7 @@ class Savvy extends BaseController
             case 'getslidecarddata':
                 $in["action"] = SAVVY_USERSAPP_SLIDECARD;
                 $extension_call = false;
+                $cards = new \App\Models\userCards();
                 //loadSliderCard($in, $out);
                 log_message('critical', "INTO API-WAS CALLED user************************************ =>".$endpoint );
                 $this->logArray($inx);
diff --git a/app/Models/userCards.php b/app/Models/userCards.php
index 5f852ca..6556dee 100644
--- a/app/Models/userCards.php
+++ b/app/Models/userCards.php
@@ -4,6 +4,15 @@ namespace App\Models;
 use CodeIgniter\Model;
 
 class userCards extends Model{
+    protected $db;
+    public $con_name = 'dbFloat';
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->db = \Config\Database::connect($this->con_name);
+    }
+
 
     /**
      * Called during initialization. 
@@ -14,9 +23,8 @@ class userCards extends Model{
        
     }
 
-    function loadSliderCard($in, &$out)
+    public function loadSliderCard($in, &$out)
     {
-        global $pgconn;
         $retvel = 0;
         $total_record = 0;
         $status = 'OK';
@@ -25,19 +33,22 @@ class userCards extends Model{
         $member_id = $in['member_id'];
         $out['status'] = $status;
         $out['session_valid'] = '';
-        $member = getMember($member_id);
+        $member = $this->getMember($member_id);
         if ($member) {
             $survey = $this->getCardBySurvey($member);
             $this->getCardsByType($out, $member, $card_type, $card_count);
-    
         }
     
     }
     
+    private function getMember($member){
+
+        return [];
+    }
         
     private function getCardBySurvey($member)
     {
-        global $pgconn;
+
         $member_id = $member['id'];
         $q = "SELECT card_id FROM  members_onboarding_survey mos
                 LEFT JOIN onboarding_survey_cards ca ON ca.answers_key = mos.answers_key
@@ -45,8 +56,9 @@ class userCards extends Model{
                 WHERE mos.member_id = " . $member_id . " AND a.status = 1
                 AND card_id NOT IN (SELECT card_id FROM members_card_assign WHERE member_id =" . $member_id . " AND status=1)
                 GROUP BY card_id";
-        $r = pg_query($pgconn, $q);
-        if ($r && pg_num_rows($r) && $f = pg_fetch_assoc($r)) {
+        
+        $query   = $db->query( $q );
+        if ( $query  && $query->getNumRows() && $f = $query->getRowArray()) {
             return $f;
         }
         return null;
@@ -95,20 +107,21 @@ class userCards extends Model{
         $deal_card_count = 0;
         $survey_card_count = 0;
         $blog_card_count = 0;
-        $r = pg_query($pgconn, $query);
-        $out['total_record_raw'] = pg_num_rows($r);
-        $out['total_record'] = pg_num_rows($r);
+        //$r = pg_query($pgconn, $query);
+        $r   = $db->query( $query );
+        $out['total_record_raw'] = $r->getNumRows();
+        $out['total_record'] = $r->getNumRows();
         $out['retval'] = PHP_API_OK;
         $out['internal_return'] = PHP_API_OK;
         $query = $query . " LIMIT " . $limit . "";
-        $r = pg_query($pgconn, $query);
+        $r   = $db->query( $query ); // with limits 
         $result = [];
-        if ($r && $total_record_raw = pg_num_rows($r)) {
+        if ($r && $total_record_raw = $r->getNumRows()) {
             $ic = 0;
-            while ($f = pg_fetch_assoc($r)) {
+            while ($f = $r->getRowArray()) {
                 $test_card_allowed = CARD_ADD_ALLOWED;
                 if ($card_type == 22000) {
-                    $test_card_allowed = verifyMemberCardDescision($f, $member, $out);
+                    $test_card_allowed = $this->verifyMemberCardDescision($f, $member, $out);
                 }
                 $card_country_allow = true;
     
@@ -213,7 +226,7 @@ class userCards extends Model{
     
     }
     
-    function verifyMemberCardDescision($cardData, $memberData, &$out)
+    private function verifyMemberCardDescision($cardData, $memberData, &$out)
     {
         $permCard = CARD_ADD_ALLOWED;
         $behaviour = $cardData["card_behavior"];
@@ -227,7 +240,7 @@ class userCards extends Model{
         return $permCard;
     }
     
-    function saveDashCard($in, &$out)
+    private function saveDashCard($in, &$out)
     {
         $ret = PHP_API_BAD_PARAM;
         $member_id = $in['member_id'];