git -C '/home/opc/rocketa.git' show 7af72dd -- app/Console/Commands/GetResultDatas.php

commit 7af72ddcf79120815f44d23fbad6425d2f9983c9
Author: Satoshi Ujihara <satoshi_ujihara@fivegate.jp>
Date:   Tue Jan 20 13:58:44 2026 +0900

    client posteback パラメータをsid,ad_id,client_idからsidのみに変更

diff --git a/app/Console/Commands/GetResultDatas.php b/app/Console/Commands/GetResultDatas.php
index 39dce1d..7dadebf 100644
--- a/app/Console/Commands/GetResultDatas.php
+++ b/app/Console/Commands/GetResultDatas.php
@@ -126,21 +126,21 @@ class GetResultDatas extends Command
             $insert_receiving_data = [];
 
             // http対応
-            if (isset($parameters['original_ip'])) {
-                $not_ssl_validate = ClientIpList::select()
-                    ->where('not_ssl', 1)
-                    ->where('client_id', $result_record['client_id'])
-                    ->where('ip', $parameters['original_ip'])
-                    ->first();
-
-                if ($not_ssl_validate || $parameters['original_ip'] == '118.238.4.197') {
-                    $result_record['ip'] = $parameters['original_ip'];
-                } else {
-                    // result_error_datas登録
-                    $this->insertResultErrorDatas($result_record, 5);
-                    continue;
-                }
-            }
+            // if (isset($parameters['original_ip'])) {
+            //     $not_ssl_validate = ClientIpList::select()
+            //         ->where('not_ssl', 1)
+            //         ->where('client_id', $result_record['client_id'])
+            //         ->where('ip', $parameters['original_ip'])
+            //         ->first();
+
+            //     if ($not_ssl_validate || $parameters['original_ip'] == '118.238.4.197') {
+            //         $result_record['ip'] = $parameters['original_ip'];
+            //     } else {
+            //         // result_error_datas登録
+            //         $this->insertResultErrorDatas($result_record, 5);
+            //         continue;
+            //     }
+            // }
 
             // デジマース対応(仮にデジマースがhttps対応した場合削除する)
             // if ($result_record['ip'] == '118.238.4.197' && $result_record['client_id'] == 1) {
@@ -148,7 +148,8 @@ class GetResultDatas extends Command
             // }
 
             // 必須パラメータチェック
-            if (!$result_record['sid'] || !$result_record['ad_id'] || !$result_record['client_id']) {
+            // if (!$result_record['sid'] || !$result_record['ad_id'] || !$result_record['client_id']) {
+            if (!$result_record['sid']) {
                 // result_error_datas登録
                 $this->insertResultErrorDatas($result_record, 1);
                 continue;
@@ -185,6 +186,8 @@ class GetResultDatas extends Command
             // sidからクリックデータ取得
             $click_record = ApiClickRecords::select(
                     'id',
+                    'master_ad_id',
+                    'client_id',
                     'media_id',
                     'uid',
                     'banner_id',
@@ -200,11 +203,13 @@ class GetResultDatas extends Command
                 )
                 ->where('created_ym', $sid_created_ym)
                 ->where('sid', $result_record['sid'])
-                ->where('master_ad_id', $result_record['ad_id'])
-                ->where('client_id', $result_record['client_id'])
+                // ->where('master_ad_id', $result_record['ad_id'])
+                // ->where('client_id', $result_record['client_id'])
                 ->first();
 
             if ($click_record) {
+                $insert_result_data['ad_id'] = $click_record['master_ad_id'];
+                $insert_result_data['client_id'] = $click_record['client_id'];
                 $insert_result_data['media_id'] = $click_record['media_id'];
                 $insert_result_data['media_uid'] = $click_record['uid'];
                 $insert_result_data['banner_id'] = $click_record['banner_id'];
@@ -213,6 +218,10 @@ class GetResultDatas extends Command
                 $insert_result_data['user_referer'] = $click_record['referer'];
                 $insert_result_data['click_at'] = $click_record['created_at'];
 
+                //ad_id, client_idを必須じゃなくしたため、これ以降のプログラムで整合性を取るため、result_recordへ値設定
+                $result_record['ad_id'] = $click_record['master_ad_id'];
+                $result_record['client_id'] = $click_record['client_id'];
+
                 if ($click_record['other_parameters']) {
                     parse_str($click_record['other_parameters'], $media_other_parameters);
                 }