From 3f07e58cbb048a5f479af1c1f32ba26e3005426d Mon Sep 17 00:00:00 2001
From: MHEN2606 <matthew.mahendra@gmail.com>
Date: Wed, 15 Nov 2023 14:19:44 +0700
Subject: [PATCH] feat: API for REST Polling

---
 app/models/scholarship.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/scholarship.php b/app/models/scholarship.php
index e135be7..adad870 100644
--- a/app/models/scholarship.php
+++ b/app/models/scholarship.php
@@ -190,8 +190,8 @@ class Scholarship
     }
 
     public function getAllScholarshipREST(){
-        $query = "SELECT user_id, scholarship_id, title, description, short_description, coverage, contact_name, contact_email
-                    FROM $this->table";
+        $query = "SELECT user_id, scholarship_id, title, description, short_description, coverage, contact_name, contact_email, GROUP_CONCAT(type) as type
+                    FROM $this->table NATURAL JOIN scholarshiptype GROUP BY user_id, scholarship_id";
         $stmt = $this->db->setSTMT($query);
         mysqli_stmt_execute($stmt);
         $result = mysqli_stmt_get_result($stmt);
-- 
GitLab