Feature/data cleaning algorithm

.env.example

@@ -44,3 +44,6 @@ PUSHER_APP_CLUSTER=mt1
 
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+SMS_SERVICE_HOST="https://domain-to-sms-service/api/sender"
+SMS_SERVICE_KEY="sms-service-key"

.github/workflows/Test deployment.yml

@@ -0,0 +1,42 @@
+name: deploy to test instance
+on:
+  push:
+    branches: [ main ]
+jobs:
+
+  build:
+    name: Deploy
+    runs-on: ubuntu-latest
+    steps:
+    - name: executing remote connection
+      uses: appleboy/ssh-action@master
+      with:
+        host: ${{ secrets.HOST }}
+        username: ${{ secrets.USERNAME }}
+        key: ${{ secrets.CICD_SECRET }}
+        port: ${{ secrets.PORT }}
+        script: |
+          cd /apps/github-workflows/mhealth-apps/
+          sudo rm -rf ushauri_dashboard
+          sudo mkdir ushauri_dashboard
+          sudo chown -R cicd2:cicd2 ushauri_dashboard
+          git config --global --add safe.directory /apps/github-workflows/mhealth-apps/ushauri_dashboard/      
+          cd ushauri_dashboard
+          git clone -b main https://github.com/palladiumkenya/ushauri_dashboard.git .
+          git status
+          cp /apps/configs/ushauri-dashboard/.env /apps/github-workflows/mhealth-apps/ushauri_dashboard/
+          cp /apps/configs/ushauri-dashboard/docker-compose.yml /apps/github-workflows/mhealth-apps/ushauri_dashboard/
+          cp /apps/configs/ushauri-dashboard/nginx.dockerfile /apps/github-workflows/mhealth-apps/ushauri_dashboard/
+          cp /apps/configs/ushauri-dashboard/php.dockerfile /apps/github-workflows/mhealth-apps/ushauri_dashboard/
+          cp -r /apps/configs/ushauri-dashboard/nginx /apps/github-workflows/mhealth-apps/ushauri_dashboard/
+          docker-compose down
+          docker-compose rm -f
+          docker-compose --env-file .env up -d --build site
+          # execute normal laravel commands
+          docker-compose exec -T php composer install --ignore-platform-reqs --no-dev
+          docker-compose exec -T php php artisan config:cache
+          docker-compose exec -T php php artisan view:cache
+          docker-compose exec -T php chmod -R 777 storage/
+          docker-compose exec -T php php artisan config:cache
+          docker-compose exec -T php php artisan config:clear
+          echo "done!"

.github/workflows/cicd_process.yml

@@ -0,0 +1,22 @@
+name: deploy to test instance
+on:
+  push:
+    branches: [ master ]
+jobs:
+
+  build:
+    name: Deploy
+    runs-on: ubuntu-latest
+    steps:
+    - name: executing remote connection
+      uses: appleboy/ssh-action@master
+      with:
+        host: ${{ secrets.PRODUCTION_HOST }}
+        username: ${{ secrets.PRODUCTION_USERNAME }}
+        key: ${{ secrets.PRODUCTION_SECRET }}
+        port: ${{ secrets.PRODUCTION_PORT }}
+        script: |
+
+          cd /var/www/ushauri_dashboard
+          git pull origin 
+

README.md

@@ -1,61 +1,61 @@
-<p align="center"><a href="https://laravel.com" target="_blank"><img src="https://raw.githubusercontent.com/laravel/art/master/logo-lockup/5%20SVG/2%20CMYK/1%20Full%20Color/laravel-logolockup-cmyk-red.svg" width="400"></a></p>
+# Getting started
+ [![deploy to test instance](https://github.com/palladiumkenya/ushauri_dashboard/actions/workflows/cicd_process.yml/badge.svg)](https://github.com/palladiumkenya/ushauri_dashboard/actions/workflows/cicd_process.yml)
+## Installation
+<hr>
+Please check the official laravel installation guide for server requirements before you start. [Official Documentation](https://laravel.com/docs/8.x/installation)
 
-<p align="center">
-<a href="https://travis-ci.org/laravel/framework"><img src="https://travis-ci.org/laravel/framework.svg" alt="Build Status"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://poser.pugx.org/laravel/framework/d/total.svg" alt="Total Downloads"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://poser.pugx.org/laravel/framework/v/stable.svg" alt="Latest Stable Version"></a>
-<a href="https://packagist.org/packages/laravel/framework"><img src="https://poser.pugx.org/laravel/framework/license.svg" alt="License"></a>
-</p>
+Clone the repository
 
-## About Laravel
+    git clone https://github.com/palladiumkenya/ushauri_dashboard
 
-Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel takes the pain out of development by easing common tasks used in many web projects, such as:
+Switch to the repo folder
+    cd ushauri_dashboard
 
-- [Simple, fast routing engine](https://laravel.com/docs/routing).
-- [Powerful dependency injection container](https://laravel.com/docs/container).
-- Multiple back-ends for [session](https://laravel.com/docs/session) and [cache](https://laravel.com/docs/cache) storage.
-- Expressive, intuitive [database ORM](https://laravel.com/docs/eloquent).
-- Database agnostic [schema migrations](https://laravel.com/docs/migrations).
-- [Robust background job processing](https://laravel.com/docs/queues).
-- [Real-time event broadcasting](https://laravel.com/docs/broadcasting).
+Install all the dependencies using composer
 
-Laravel is accessible, powerful, and provides tools required for large, robust applications.
+    composer install
 
-## Learning Laravel
+Copy the example env file and make the required configuration changes in the .env file
 
-Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework.
+    cp .env.example .env
 
-If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 1500 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library.
+Start the local development server
 
-## Laravel Sponsors
+    php artisan serve
 
-We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](https://patreon.com/taylorotwell).
+You can now access the server at http://localhost:8000
 
-### Premium Partners
+**TL;DR command list**
 
-- **[Vehikl](https://vehikl.com/)**
-- **[Tighten Co.](https://tighten.co)**
-- **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)**
-- **[64 Robots](https://64robots.com)**
-- **[Cubet Techno Labs](https://cubettech.com)**
-- **[Cyber-Duck](https://cyber-duck.co.uk)**
-- **[Many](https://www.many.co.uk)**
-- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)**
-- **[DevSquad](https://devsquad.com)**
-- **[OP.GG](https://op.gg)**
+    git clone https://github.com/palladiumkenya/ushauri_dashboard
+    cd ushauri_dashboard
+    composer install
+    cp .env.example .env
+    php artisan serve
+
+ ----------
 
-## Contributing
+# Code overview
 
-Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions).
+## Folders
 
-## Code of Conduct
+- `app/Models` - Contains all the Eloquent models
+- `app/Http/Controllers` - Contain all the data controllers
+- `app/Http/Controllers/Auth` - Contains all the auth controllers
+- `app/Http/Middleware` - Contains the JWT auth middleware
+- `app/Http/Jobs` - Contains all the jobs handlers
+- `config` - Contains all the application configuration files
+- `database/factories` - Contains the model factory for all the models
+- `database/seeds` - Contains the database seeder
+- `resources` - Contains all the application views and styling files
+- `routes` - Contains all the web routes defined in web.php file
+- `tests` - Contains all the application tests
 
-In order to ensure that the Laravel community is welcoming to all, please review and abide by the [Code of Conduct](https://laravel.com/docs/contributions#code-of-conduct).
+## Environment variables
 
-## Security Vulnerabilities
+- `.env` - Environment variables can be set in this file
 
-If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell via [[email protected]](mailto:[email protected]). All security vulnerabilities will be promptly addressed.
+***Note*** : You can quickly set the database information and other variables in this file and have the application fully working.
 
-## License
+----------
 
-The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).

app/Console/Commands/ClientReferral.php

@@ -0,0 +1,167 @@
+<?php
+
+namespace App\Console\Commands;
+
+use AfricasTalking\SDK\AfricasTalking;
+
+use App\Http\Controllers\SenderController;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
+use App\Models\Client;
+use App\Models\Appointments;
+use App\Models\Facility;
+use App\Models\Ward;
+use App\Models\Content;
+use App\Models\ClientOutgoing;
+use DB;
+use Carbon\Carbon;
+
+use function PHPUnit\Framework\isEmpty;
+
+class ClientReferral extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'client:referral';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Notify Transfered Clients';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+
+    public function send_message($source, $destination, $msg)
+    {
+        $key = env('SMS_SERVICE_KEY', '');
+        $host = env('SMS_SERVICE_HOST', '');
+
+        $this->httpresponse = Http::withoutVerifying()
+            ->withHeaders(['api-token' => "$key"])
+            ->post("$host", [
+                'destination' => $destination,
+                'msg' => $msg,
+                'sender_id' => $destination,
+                'gateway' => $source,
+
+            ]);
+
+        return json_decode($this->httpresponse->getBody(), true);
+    }
+
+    public function handle()
+    {
+        $client = Client::join('tbl_master_facility', 'tbl_client.mfl_code', '=', 'tbl_master_facility.code')
+            ->leftJoin('tbl_ward', 'tbl_master_facility.Ward_id', '=', 'tbl_ward.id')
+            ->join('tbl_appointment', 'tbl_client.id', '=', 'tbl_appointment.client_id')
+            ->select(
+                'tbl_client.clinic_number',
+                'tbl_client.id as client_id',
+                'tbl_client.phone_no',
+                'tbl_client.client_type',
+                'tbl_client.f_name',
+                'tbl_client.language_id',
+                'tbl_master_facility.name as facility',
+                'tbl_ward.name as location',
+                DB::raw('(CASE WHEN tbl_appointment.appntmnt_date > CURDATE() THEN tbl_appointment.appntmnt_date
+                WHEN tbl_client.language_id = "1" THEN "huna siku ya cliniki"
+                ELSE "no appointment" END) as appointment_date')
+            )
+            ->where('tbl_client.client_type', '=', 'Transfer')
+            ->whereNotNull('tbl_client.phone_no')
+            ->whereDate('tbl_client.updated_at', [now()->subMinutes(30), now()])
+            ->groupBy('tbl_client.id')
+            ->get();
+
+
+
+        foreach ($client as $value) {
+            $phone_no = $value->phone_no;
+            $client_id = $value->client_id;
+            $client_type = $value->client_type;
+            $client_name = $value->f_name;
+            $facility = $value->facility;
+            $location = $value->location;
+            $language = $value->language_id;
+            $appointment_date = $value->appointment_date;
+
+            $check_existence = ClientOutgoing::select('*')->where('message_type_id', '=', '2')
+                ->where('clnt_usr_id', '=', $client_id)
+                ->whereDate('created_at', '=', Carbon::Now())
+                ->limit(1)->count();
+
+            if ($check_existence > 0) {
+                echo 'Message already sent to the client';
+            } else {
+                if (!empty($phone_no)) {
+
+                    if ($language !== 2 || $language !== 1) {
+                        $get_message = Content::select('*')->where('identifier', '=', '20')->where('language_id', '=', '2')->get();
+                    } else {
+                        $get_message = Content::select('*')->where('identifier', '=', '20')->where('language_id', '=', $language)->get();
+                    }
+
+                    foreach ($get_message as $value) {
+                        $message = $value->content;
+                        $content_id = $value->id;
+                        $source = '40149';
+
+                        $new_message = str_replace("XXX", $client_name, $message);
+                        $facility_name = str_replace('FFF', $facility, $new_message);
+                        $location_name = str_replace('LLL', $location, $facility_name);
+                        $final_message = str_replace('YYY', $appointment_date, $location_name);
+
+                        $save_outgoing = new ClientOutgoing;
+
+                        $save_outgoing->destination = $phone_no;
+                        $save_outgoing->msg = $final_message;
+                        $save_outgoing->source = '40149';
+                        $save_outgoing->responded = 'No';
+                        $save_outgoing->status = 'Not Sent';
+                        $save_outgoing->message_type_id = '2';
+                        $save_outgoing->clnt_usr_id = $client_id;
+                        $save_outgoing->recepient_type = 'Client';
+                        $save_outgoing->content_id = $content_id;
+                        // $save_outgoing->created_at = date("Y-m-d H:i:s");
+                        $save_outgoing->created_by = '1';
+
+                        if ($save_outgoing->save()) {
+                            // $sender = new SenderController;
+                            $sender = $this->send_message($source, $phone_no, $final_message);
+
+                            echo json_encode($sender);
+                        } else {
+                            echo 'Could not send the message';
+                        }
+                    }
+                } else {
+                    echo 'Can not send to an empty phone number';
+                }
+            }
+        }
+
+        dd("Clients : {$client}");
+
+
+        // return 0;
+    }
+}

app/Console/Kernel.php

@@ -13,7 +13,7 @@ class Kernel extends ConsoleKernel
      * @var array
      */
     protected $commands = [
-        //
+        'App\Console\Commands\ClientReferral',
     ];
 
     /**
@@ -25,6 +25,7 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule)
     {
         // $schedule->command('inspire')->hourly();
+        $schedule->command('client:referral')->everyMinutes(30);
     }
 
     /**
@@ -34,7 +35,7 @@ protected function schedule(Schedule $schedule)
      */
     protected function commands()
     {
-        $this->load(__DIR__.'/Commands');
+        $this->load(__DIR__ . '/Commands');
 
         require base_path('routes/console.php');
     }