From 23457f36cc1c32a535b6c4a54eaae5224d3f8311 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Tue, 9 May 2023 12:02:42 -0400 Subject: [PATCH 1/6] Falily detail --- www-api/app/Config/Routes.php | 3 ++- www-api/app/Controllers/WrenchApi.php | 1 + www-api/app/Models/ResultFormatter.php | 4 +++- www-api/public/svs/user/formarter.php | 4 +++- www-api/public/svs/user/userve.php | 1 + 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/www-api/app/Config/Routes.php b/www-api/app/Config/Routes.php index c4bbbf7f..f8a9aa0e 100644 --- a/www-api/app/Config/Routes.php +++ b/www-api/app/Config/Routes.php @@ -73,8 +73,9 @@ $routes->post('/en/wrench/api/v1/stepresetpass', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/starttopup', 'WrenchApi::apigate'); +$routes->post('/en/wrench/api/v1/jobmanageragree', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/jobmanagerlist', 'WrenchApi::apigate'); -$routes->post('/en/wrench/api/v1/jobmanageroffers', 'WrenchApi::apigate'); +$routes->post('/en/wrench/api/v1/jobmanageroffers', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/familylist', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/familyadd', 'WrenchApi::apigate'); diff --git a/www-api/app/Controllers/WrenchApi.php b/www-api/app/Controllers/WrenchApi.php index 2061bfb9..98672f88 100644 --- a/www-api/app/Controllers/WrenchApi.php +++ b/www-api/app/Controllers/WrenchApi.php @@ -79,6 +79,7 @@ class WrenchApi extends BaseController 'sendreferral' => ['POST'], 'refferhx' => ['POST'], 'accounttypes' => ['POST'], + 'jobmanageragree' => ['POST'], 'jobmanagerlist' => ['POST'], 'jobmanageroffers'=> ['POST'], 'profilepasschange' => ['POST'], diff --git a/www-api/app/Models/ResultFormatter.php b/www-api/app/Models/ResultFormatter.php index d2042df4..a1c6ca27 100644 --- a/www-api/app/Models/ResultFormatter.php +++ b/www-api/app/Models/ResultFormatter.php @@ -97,7 +97,9 @@ class ResultFormatter extends Model "uid" => $out["uid_${key}"], "firstname" => $out["firstname_${key}"], "lastname" => $out["lastname_${key}"], - "age" => $out["age_${key}"] + "age" => $out["age_${key}"], + "last_login" => '10-10-2024', + "task_count" => rand(0,20) ); } diff --git a/www-api/public/svs/user/formarter.php b/www-api/public/svs/user/formarter.php index 3b670d3c..f45823a1 100755 --- a/www-api/public/svs/user/formarter.php +++ b/www-api/public/svs/user/formarter.php @@ -91,7 +91,9 @@ function processOutJson($in, $out) { "uid" => $out["uid_${key}"], "firstname" => $out["firstname_${key}"], "lastname" => $out["lastname_${key}"], - "age" => $out["age_${key}"] + "age" => $out["age_${key}"], + "last_login" => '10-10-2024', + "task_count" => rand(0,20) ); } diff --git a/www-api/public/svs/user/userve.php b/www-api/public/svs/user/userve.php index 3539c71f..1063ad3e 100755 --- a/www-api/public/svs/user/userve.php +++ b/www-api/public/svs/user/userve.php @@ -58,6 +58,7 @@ $endpoints = array( 'sendreferral' => array('POST'), 'refferhx' => array('POST'), 'accounttypes' => array('POST'), + 'jobmanageragree' => array('POST'), 'jobmanagerlist' => array('POST'), 'jobmanageroffers'=> array('POST'), 'profilepasschange' => array('POST'), From 9528fd4e3caec58893372f37a86ed41957285d28 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Tue, 9 May 2023 12:34:10 -0400 Subject: [PATCH 2/6] missing family data --- www-api/app/Models/ResultFormatter.php | 3 ++- www-api/public/svs/user/formarter.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/www-api/app/Models/ResultFormatter.php b/www-api/app/Models/ResultFormatter.php index a1c6ca27..bc8f146a 100644 --- a/www-api/app/Models/ResultFormatter.php +++ b/www-api/app/Models/ResultFormatter.php @@ -99,7 +99,8 @@ class ResultFormatter extends Model "lastname" => $out["lastname_${key}"], "age" => $out["age_${key}"], "last_login" => '10-10-2024', - "task_count" => rand(0,20) + "task_count" => rand(0,20), + "added" => '10-10-2024' ); } diff --git a/www-api/public/svs/user/formarter.php b/www-api/public/svs/user/formarter.php index f45823a1..e99044d3 100755 --- a/www-api/public/svs/user/formarter.php +++ b/www-api/public/svs/user/formarter.php @@ -93,7 +93,8 @@ function processOutJson($in, $out) { "lastname" => $out["lastname_${key}"], "age" => $out["age_${key}"], "last_login" => '10-10-2024', - "task_count" => rand(0,20) + "task_count" => rand(0,20), + "added" => '10-10-2024' ); } From 069d03bee92443f3674a2da434275b0352cd5429 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Tue, 9 May 2023 16:01:55 -0400 Subject: [PATCH 3/6] Job agree --- wrenchboard/src/include/wrenchboard_api.h | 1 + wrenchboard/src/shared_tool/jobs.cc | 20 ++++++++++++++++++++ www-api/app/Config/Constants.php | 1 + www-api/app/Controllers/WrenchApi.php | 3 +++ www-api/public/svs/user/constants.php | 1 + www-api/public/svs/user/userve.php | 3 +++ 6 files changed, 29 insertions(+) diff --git a/wrenchboard/src/include/wrenchboard_api.h b/wrenchboard/src/include/wrenchboard_api.h index 907b1068..3483d5d8 100644 --- a/wrenchboard/src/include/wrenchboard_api.h +++ b/wrenchboard/src/include/wrenchboard_api.h @@ -223,6 +223,7 @@ enum { PARTNER_STRIPE }; //************************************************************** #define WRENCHBOARD_JOBS_START 13000 +#define WRENCHBOARD_JOB_POSTAGREE 13002 #define WRENCHBOARD_JOB_LISTJOBS 13005 #define WRENCHBOARD_JOB_OFFERS 13006 diff --git a/wrenchboard/src/shared_tool/jobs.cc b/wrenchboard/src/shared_tool/jobs.cc index ecf5f176..6da9d777 100644 --- a/wrenchboard/src/shared_tool/jobs.cc +++ b/wrenchboard/src/shared_tool/jobs.cc @@ -21,6 +21,8 @@ long WrenchJobsQuestion(CVars in, CVars &out); long WrenchMarketInterestQuestion(CVars in, CVars &out); long WrenchReplyMessage(CVars in, CVars &out); +long WrenchJobPostAgree(CVars in, CVars &out); + long jobs_calls(CVars in, CVars &out) { logfmt(logINFO, "jobs_calls()"); @@ -28,6 +30,9 @@ long jobs_calls(CVars in, CVars &out) { long action = REQ_LONG(in, "action", 0, -1); logfmt(logINFO, "jobs_calls() action=%lu",action); switch (action) { + case WRENCHBOARD_JOB_POSTAGREE: + return WrenchJobPostAgree(in, out); + break; case WRENCHBOARD_JOB_LISTJOBS: return WrenchJobManagerList(in, out); break; @@ -97,6 +102,21 @@ long jobs_calls(CVars in, CVars &out) { return 0; } +long WrenchJobPostAgree(CVars in, CVars &out) { + long member_id = REQ_LONG(in, "member_id", 1, -1); + long message_id = REQ_LONG(in, "message_id", 1, -1); + + REQ_STRING(in, "yourmessage", 1, 500, "(.*)"); //offer_code + REQ_STRING(in, "memo", 1, 15, "(.*)"); //offer_code + + + + + logfmt(logINFO, "/WrenchReplyMessage()"); + return 0; +} + + long WrenchReplyMessage(CVars in, CVars &out) { long member_id = REQ_LONG(in, "member_id", 1, -1); long message_id = REQ_LONG(in, "message_id", 1, -1); diff --git a/www-api/app/Config/Constants.php b/www-api/app/Config/Constants.php index 9ec98fb4..44e77158 100644 --- a/www-api/app/Config/Constants.php +++ b/www-api/app/Config/Constants.php @@ -215,6 +215,7 @@ define('WRENCHBOARD_ACCOUNT_HOMEBANNERS', 11200); define('WRENCHBOARD_USER_DELETEACC', 11990); define('WRENCHBOARD_ACCOUNT_END', 11999); //************************************************************** +define('WRENCHBOARD_JOB_POSTAGREE', 13002); define('WRENCHBOARD_JOB_LISTJOBS', 13005); define('WRENCHBOARD_JOB_OFFERS', 13006); diff --git a/www-api/app/Controllers/WrenchApi.php b/www-api/app/Controllers/WrenchApi.php index 98672f88..c5eebc9d 100644 --- a/www-api/app/Controllers/WrenchApi.php +++ b/www-api/app/Controllers/WrenchApi.php @@ -127,6 +127,9 @@ class WrenchApi extends BaseController case 'addrecipient': $in["action"] = WRENCHBOARD_ACCOUNT_ADD_RECIPEINT; break; + case 'jobmanageragree': + $in["action"] = WRENCHBOARD_JOB_POSTAGREE; + break; case 'jobmanagerlist': $in["action"] = WRENCHBOARD_JOB_LISTJOBS; break; diff --git a/www-api/public/svs/user/constants.php b/www-api/public/svs/user/constants.php index 129ddf14..3d577a5d 100755 --- a/www-api/public/svs/user/constants.php +++ b/www-api/public/svs/user/constants.php @@ -121,6 +121,7 @@ define('WRENCHBOARD_ACCOUNT_HOMEBANNERS', 11200); define('WRENCHBOARD_USER_DELETEACC', 11990); define('WRENCHBOARD_ACCOUNT_END', 11999); //************************************************************** +define('WRENCHBOARD_JOB_POSTAGREE', 13002); define('WRENCHBOARD_JOB_LISTJOBS', 13005); define('WRENCHBOARD_JOB_OFFERS', 13006); define('WRENCHBOARD_JOB_CREATEJOB',13010 ); diff --git a/www-api/public/svs/user/userve.php b/www-api/public/svs/user/userve.php index 1063ad3e..0428b104 100755 --- a/www-api/public/svs/user/userve.php +++ b/www-api/public/svs/user/userve.php @@ -162,6 +162,9 @@ switch ($endpoint) { case 'addrecipient': $in["action"] = WRENCHBOARD_ACCOUNT_ADD_RECIPEINT; break; + case 'jobmanageragree': + $in["action"] = WRENCHBOARD_JOB_POSTAGREE; + break; case 'jobmanagerlist': $in["action"] = WRENCHBOARD_JOB_LISTJOBS; break; From d1c9f7d83f091cd95f234781302fb8eec924a864 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Tue, 9 May 2023 17:48:09 -0400 Subject: [PATCH 4/6] job agree --- wrenchboard/src/shared_tool/jobs.cc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/wrenchboard/src/shared_tool/jobs.cc b/wrenchboard/src/shared_tool/jobs.cc index 6da9d777..0e8b3035 100644 --- a/wrenchboard/src/shared_tool/jobs.cc +++ b/wrenchboard/src/shared_tool/jobs.cc @@ -104,15 +104,13 @@ long jobs_calls(CVars in, CVars &out) { long WrenchJobPostAgree(CVars in, CVars &out) { long member_id = REQ_LONG(in, "member_id", 1, -1); - long message_id = REQ_LONG(in, "message_id", 1, -1); + REQ_STRING(in, "uid", 1, 500, "(.*)"); //uid - REQ_STRING(in, "yourmessage", 1, 500, "(.*)"); //offer_code - REQ_STRING(in, "memo", 1, 15, "(.*)"); //offer_code + if (load_db_record(out, "SELECT * FROM members WHERE id = %lu AND uid='%s' AND post_jobs IS NULL", in["message_id"].Long(), in["uid"].c_str()) { + pgsql_exec("UPDATE members SET post_jobs = now() WHERE id = %lu AND uid='%s'", in["message_id"].Long(), in["uid"].c_str()); + } - - - - logfmt(logINFO, "/WrenchReplyMessage()"); + logfmt(logINFO, "/WrenchJobPostAgree()"); return 0; } From e0cd3ad9a9ff07ac48cdeface1c2fb18ef6d2ab9 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Tue, 9 May 2023 18:05:34 -0400 Subject: [PATCH 5/6] err fix --- wrenchboard/src/shared_tool/jobs.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wrenchboard/src/shared_tool/jobs.cc b/wrenchboard/src/shared_tool/jobs.cc index 0e8b3035..2b6bafca 100644 --- a/wrenchboard/src/shared_tool/jobs.cc +++ b/wrenchboard/src/shared_tool/jobs.cc @@ -106,7 +106,7 @@ long WrenchJobPostAgree(CVars in, CVars &out) { long member_id = REQ_LONG(in, "member_id", 1, -1); REQ_STRING(in, "uid", 1, 500, "(.*)"); //uid - if (load_db_record(out, "SELECT * FROM members WHERE id = %lu AND uid='%s' AND post_jobs IS NULL", in["message_id"].Long(), in["uid"].c_str()) { + if (load_db_record(out, "SELECT * FROM members WHERE id = %lu AND uid='%s' AND post_jobs IS NULL", in["message_id"].Long(), in["uid"].c_str()) ){ pgsql_exec("UPDATE members SET post_jobs = now() WHERE id = %lu AND uid='%s'", in["message_id"].Long(), in["uid"].c_str()); } From fd0bc9af6972ca6b36775bc22d6e033420a07240 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Tue, 9 May 2023 18:19:39 -0400 Subject: [PATCH 6/6] Fix select --- wrenchboard/src/shared_tool/jobs.cc | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/wrenchboard/src/shared_tool/jobs.cc b/wrenchboard/src/shared_tool/jobs.cc index 2b6bafca..83502578 100644 --- a/wrenchboard/src/shared_tool/jobs.cc +++ b/wrenchboard/src/shared_tool/jobs.cc @@ -103,15 +103,24 @@ long jobs_calls(CVars in, CVars &out) { } long WrenchJobPostAgree(CVars in, CVars &out) { - long member_id = REQ_LONG(in, "member_id", 1, -1); - REQ_STRING(in, "uid", 1, 500, "(.*)"); //uid - - if (load_db_record(out, "SELECT * FROM members WHERE id = %lu AND uid='%s' AND post_jobs IS NULL", in["message_id"].Long(), in["uid"].c_str()) ){ - pgsql_exec("UPDATE members SET post_jobs = now() WHERE id = %lu AND uid='%s'", in["message_id"].Long(), in["uid"].c_str()); + logfmt(logINFO, "WrenchJobPostAgree()"); + long ret = PHP_API_BAD_PARAM; + try { + long member_id = REQ_LONG(in, "member_id", 1, -1); + REQ_STRING(in, "uid", 1, 500, "(.*)"); //uid + if (load_db_record(out, "SELECT id AS member_id, * FROM members WHERE id = %lu AND uid='%s' AND post_jobs IS NULL", in["member_id"].Long(), in["uid"].c_str()) ){ + if ( out["member_id"].Long() > 0 ) + { + pgsql_exec("UPDATE members SET post_jobs = now() WHERE id = %lu AND uid='%s'", in["message_id"].Long(), in["uid"].c_str()); + load_db_record(out, "SELECT * FROM members WHERE id = %lu AND uid='%s' AND post_jobs IS NOT NULL", in["member_id"].Long(), in["uid"].c_str()); + } + } + ret = PHP_CREATED_OK; + } catch (bad_parameter) { + out["log_status"] = "Error WrenchMarketInterestQuestion"; } - logfmt(logINFO, "/WrenchJobPostAgree()"); - return 0; + return ret; }