From 5ff2f08bae8b68d722e76a0f302af6c2352ff1ee Mon Sep 17 00:00:00 2001
From: Genvictus <johannstarkmk42@gmail.com>
Date: Thu, 16 Nov 2023 23:10:53 +0700
Subject: [PATCH] fix: analytics data
---
docker-compose.yml | 1 +
src/app/models/GetAnalyticDataModel.php | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 85350a9..ef5ccd6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,6 +2,7 @@ version: '3.3'
services:
php-web:
image: php-app
+ container_name: php-web
ports:
- 8008:80
depends_on:
diff --git a/src/app/models/GetAnalyticDataModel.php b/src/app/models/GetAnalyticDataModel.php
index 9362d72..720ffd5 100644
--- a/src/app/models/GetAnalyticDataModel.php
+++ b/src/app/models/GetAnalyticDataModel.php
@@ -19,10 +19,10 @@ class GetAnalyticDataModel
public function getFollows($username, $date){
try{
$db = PDOHandler::getInstance()->getPDO();
- $sql = "SELECT COUNT(*) AS total from follows f INNER JOIN users u ON followed_user_id=id WHERE u.username='$username' AND f.created_at <= '$date'::date";
+ $sql = "SELECT COUNT(*) AS total from follows f INNER JOIN users u ON followed_user_id=id WHERE u.username='$username' AND f.created_at <= '$date'::date+1";
$result = $db->query($sql);
if($result){
- $data = $result->fetchAll(PDO::FETCH_ASSOC);
+ $data = $result->fetch(PDO::FETCH_ASSOC);
return $data;
}
else{
@@ -66,12 +66,12 @@ class GetAnalyticDataModel
if(!$owner) return null;
$owner = $owner['id'];
- $repliesQuery = "SELECT COUNT(*) AS total FROM posts WHERE refer_type='Reply' AND refer_post_owner=$owner AND refer_post=$post_id AND created_at <= '$date'::date";
+ $repliesQuery = "SELECT COUNT(*) AS total FROM posts WHERE refer_type='Reply' AND refer_post_owner=$owner AND refer_post=$post_id AND created_at <= '$date'::date+1";
$repliesResult = $db->query($repliesQuery);
if(is_null($repliesResult)) return null;
$repliescount = $repliesResult->fetch(PDO::FETCH_ASSOC);
- $likesQuery = "SELECT COUNT(*) AS total FROM likes WHERE post_owner_id=$owner AND post_id=$post_id AND created_at <= '$date'::date";
+ $likesQuery = "SELECT COUNT(*) AS total FROM likes WHERE post_owner_id=$owner AND post_id=$post_id AND created_at <= '$date'::date+1";
$likesResult = $db->query($likesQuery);
if(is_null($likesResult)) return null;
$likescount = $likesResult->fetch(PDO::FETCH_ASSOC);
--
GitLab