From aa2a1a2f5cd815af9dde22e0be383ffb6b006457 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Mon, 8 May 2023 11:22:30 -0400 Subject: [PATCH] Family backend --- wrenchboard/src/include/family_acc.h | 8 ++ wrenchboard/src/include/wrenchboard_api.h | 9 +++ wrenchboard/src/shared_tool/family_acc.cc | 81 +++++++++++++++++++ wrenchboard/src/shared_tool/jobs_manager.cc | 1 - .../src/shared_tool/wrenchboard_api_main.cc | 8 ++ www-api/app/Config/Constants.php | 4 + www-api/app/Config/Routes.php | 4 + www-api/app/Controllers/WrenchApi.php | 20 +++++ www-api/public/svs/user/constants.php | 4 + www-api/public/svs/user/userve.php | 20 +++++ 10 files changed, 158 insertions(+), 1 deletion(-) create mode 100644 wrenchboard/src/include/family_acc.h create mode 100644 wrenchboard/src/shared_tool/family_acc.cc diff --git a/wrenchboard/src/include/family_acc.h b/wrenchboard/src/include/family_acc.h new file mode 100644 index 00000000..2c9c4227 --- /dev/null +++ b/wrenchboard/src/include/family_acc.h @@ -0,0 +1,8 @@ +#ifndef __mx_family_acc_h__ +#define __mx_family_acc_h__ + +#include "vars.h" + +long family_calls(CVars in, CVars &out); + +#endif \ No newline at end of file diff --git a/wrenchboard/src/include/wrenchboard_api.h b/wrenchboard/src/include/wrenchboard_api.h index 84093389..907b1068 100644 --- a/wrenchboard/src/include/wrenchboard_api.h +++ b/wrenchboard/src/include/wrenchboard_api.h @@ -270,6 +270,15 @@ enum { PARTNER_STRIPE }; #define WRENCHBOARD_MOBILE_END 15999 //************************************************************** +#define WRENCHBOARD_FAMILY_START 22000 + +#define WRENCHBOARD_FAMILY_LIST 22010 +#define WRENCHBOARD_FAMILY_ADD 22015 +#define WRENCHBOARD_FAMILY_UPDATE 22020 +#define WRENCHBOARD_FAMILY_MANAGE 22025 + +#define WRENCHBOARD_FAMILY_END 22999 +//************************************************************** #define WRENCHBOARD_SMONEY_START 33000 #define WRENCHBOARD_SMONEY_ADDRECIPIENT 33010 diff --git a/wrenchboard/src/shared_tool/family_acc.cc b/wrenchboard/src/shared_tool/family_acc.cc new file mode 100644 index 00000000..37b61f48 --- /dev/null +++ b/wrenchboard/src/shared_tool/family_acc.cc @@ -0,0 +1,81 @@ +#include "clog.h" +#include "cgi.h" +#include "input.h" +#include "wrenchboard_api.h" +#include "reco_engine.h" //error in file name +#include "email.h" +#include "safestring.h" +#include +#include "pgsql.h" +#include "pgsql_wrapper.h" +#include +#include "account.h" +#include "cards.h" +#include "twilo.h" +#include "mobile.h" +#include "jobs_manager.h" +#include "family_acc.h" + +long WrenchFamilyList(CVars in, CVars &out); +long WrenchFamilyAdd(CVars in, CVars &out); +long WrenchFamilyUpdate(CVars in, CVars &out); +long WrenchFamilyManage(CVars in, CVars &out); + +long family_calls(CVars in, CVars &out){ + logfmt(logINFO, "family_calls()"); + out["result"] = "YES I GET TO BACK END"; + long action = REQ_LONG(in, "action", 0, -1); + CVars x; + long ret = 0; + const char * loc = getenv("REMOTE_ADDR"); + const PGresult *res; + logfmt(logINFO, "action = %ld", action); + + switch (action) { + case WRENCHBOARD_FAMILY_LIST: + return WrenchFamilyList(in, out); + break; + + case WRENCHBOARD_FAMILY_ADD: + return WrenchFamilyAdd(in, out); + break; + + case WRENCHBOARD_FAMILY_UPDATE: + return WrenchFamilyUpdate(in, out); + break; + + case WRENCHBOARD_FAMILY_MANAGE: + return WrenchFamilyManage(in, out); + break; + } +return 0; +} + +long WrenchFamilyList(CVars in, CVars &out){ + logfmt(logINFO, "WrenchFamilyList()"); +return 0; +} + +long WrenchFamilyAdd(CVars in, CVars &out){ + logfmt(logINFO, "WrenchFamilyAdd()"); +return 0; +} + +long WrenchFamilyUpdate(CVars in, CVars &out){ + logfmt(logINFO, "WrenchFamilyUpdate()"); +return 0; +} + +long WrenchFamilyManage(CVars in, CVars &out){ + logfmt(logINFO, "WrenchFamilyManage()"); +return 0; +} + + +/* + +#define WRENCHBOARD_FAMILY_LIST 22010 +#define WRENCHBOARD_FAMILY_ADD 22015 +#define WRENCHBOARD_FAMILY_UPDATE 22020 +#define WRENCHBOARD_FAMILY_MANAGE 22025 +*/ \ No newline at end of file diff --git a/wrenchboard/src/shared_tool/jobs_manager.cc b/wrenchboard/src/shared_tool/jobs_manager.cc index 629be4f2..a7cff476 100644 --- a/wrenchboard/src/shared_tool/jobs_manager.cc +++ b/wrenchboard/src/shared_tool/jobs_manager.cc @@ -1,4 +1,3 @@ -// Twillo management toosl #include "clog.h" #include "cgi.h" #include "input.h" diff --git a/wrenchboard/src/shared_tool/wrenchboard_api_main.cc b/wrenchboard/src/shared_tool/wrenchboard_api_main.cc index 8bf1e5ed..4319c070 100644 --- a/wrenchboard/src/shared_tool/wrenchboard_api_main.cc +++ b/wrenchboard/src/shared_tool/wrenchboard_api_main.cc @@ -21,6 +21,7 @@ #include "account_mngt.h" #include "coupons.h" #include "cards.h" +#include "family_acc.h" #include "twilo.h" //extern CSQL *sql; @@ -58,6 +59,11 @@ long wrenchboard_api_main(CVars in, CVars &out) { return sitecrons_calls(in, out); } + if (action >= WRENCHBOARD_FAMILY_START && action <= WRENCHBOARD_FAMILY_END) { + logfmt(logINFO, "family_calls"); + return family_calls(in, out); + } + if (action >= WRENCHBOARD_CARDS_START && action <= WRENCHBOARD_CARDS_END) { logfmt(logINFO, "card_calls"); return card_calls(in, out); @@ -116,6 +122,8 @@ long wrenchboard_api_main(CVars in, CVars &out) { case 9999099: return test_email(in, out); break; + + case WRENCHBOARD_LOGIN_SHOP: return LoginShop(in, out); break; diff --git a/www-api/app/Config/Constants.php b/www-api/app/Config/Constants.php index 663fcf0c..9ec98fb4 100644 --- a/www-api/app/Config/Constants.php +++ b/www-api/app/Config/Constants.php @@ -264,6 +264,10 @@ define('WRENCHBOARD_MOBILE_TASKMESSAGE', 15047); define('WRENCHBOARD_MOBILE_SENDTASKMESSAGE', 15048); define('WRENCHBOARD_MOBILE_PURCHASEHX', 15049); +define('WRENCHBOARD_FAMILY_LIST', 22010); +define('WRENCHBOARD_FAMILY_ADD', 22015); +define('WRENCHBOARD_FAMILY_UPDATE', 22020); +define('WRENCHBOARD_FAMILY_MANAGE', 22025); define('WRENCHBOARD_SMONEY_ADDRECIPIENT', 33010); define('WRENCHBOARD_SMONEY_MEMBER', 33020); diff --git a/www-api/app/Config/Routes.php b/www-api/app/Config/Routes.php index b8a7c8a2..c4bbbf7f 100644 --- a/www-api/app/Config/Routes.php +++ b/www-api/app/Config/Routes.php @@ -76,6 +76,10 @@ $routes->post('/en/wrench/api/v1/starttopup', '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/familylist', 'WrenchApi::apigate'); +$routes->post('/en/wrench/api/v1/familyadd', 'WrenchApi::apigate'); +$routes->post('/en/wrench/api/v1/familyupdate', 'WrenchApi::apigate'); +$routes->post('/en/wrench/api/v1/familymanage', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/recipients', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/addrecipient', 'WrenchApi::apigate'); diff --git a/www-api/app/Controllers/WrenchApi.php b/www-api/app/Controllers/WrenchApi.php index 6a60deec..2061bfb9 100644 --- a/www-api/app/Controllers/WrenchApi.php +++ b/www-api/app/Controllers/WrenchApi.php @@ -83,12 +83,32 @@ class WrenchApi extends BaseController 'jobmanageroffers'=> ['POST'], 'profilepasschange' => ['POST'], 'starttopup' => ['POST'], + 'familylist' => ['POST'], + 'familyadd' => ['POST'], + 'familyupdate' => ['POST'], + 'familymanage' => ['POST'], ]; return $endpoints; } private function prepareEndPointData($endpoint, $in, &$call_backend=true,&$local_out=[]){ switch ($endpoint) { + case 'familylist': + $in["action"] = WRENCHBOARD_FAMILY_LIST; + break; + + case 'familyadd': + $in["action"] = WRENCHBOARD_FAMILY_ADD; + break; + + case 'familyupdate': + $in["action"] = WRENCHBOARD_FAMILY_UPDATE; + break; + + case 'familymanage': + $in["action"] = WRENCHBOARD_FAMILY_MANAGE; + break; + case 'jobmanageroffers': $in["action"] = WRENCHBOARD_JOB_OFFERS; break; diff --git a/www-api/public/svs/user/constants.php b/www-api/public/svs/user/constants.php index 40bc6a7f..129ddf14 100755 --- a/www-api/public/svs/user/constants.php +++ b/www-api/public/svs/user/constants.php @@ -153,6 +153,10 @@ define('WRENCHBOARD_GROUP_ACCEPTGROUP', 12020); define('WRENCHBOARD_GROUP_END', 12999); //************************************************************** +define('WRENCHBOARD_FAMILY_LIST', 22010); +define('WRENCHBOARD_FAMILY_ADD', 22015); +define('WRENCHBOARD_FAMILY_UPDATE', 22020); +define('WRENCHBOARD_FAMILY_MANAGE', 22025); define('WRENCHBOARD_CONTRACT_MESSAGE', 14010); define('WRENCHBOARD_CONTRACT_STATUS', 14015); diff --git a/www-api/public/svs/user/userve.php b/www-api/public/svs/user/userve.php index f403d12d..3539c71f 100755 --- a/www-api/public/svs/user/userve.php +++ b/www-api/public/svs/user/userve.php @@ -62,6 +62,10 @@ $endpoints = array( 'jobmanageroffers'=> array('POST'), 'profilepasschange' => array('POST'), 'starttopup' => array('POST'), + 'familylist' => array('POST'), + 'familyadd' => array('POST'), + 'familyupdate' => array('POST'), + 'familymanage' => array('POST'), ); $call_backend = true; // sometimes we need to overwite the call to the extenstion API @@ -124,6 +128,22 @@ if ($_SERVER["REQUEST_METHOD"] == "GET") { } $in["loc"] = $_SERVER["REMOTE_ADDR"]; switch ($endpoint) { + case 'familylist': + $in["action"] = WRENCHBOARD_FAMILY_LIST; + break; + + case 'familyadd': + $in["action"] = WRENCHBOARD_FAMILY_ADD; + break; + + case 'familyupdate': + $in["action"] = WRENCHBOARD_FAMILY_UPDATE; + break; + + case 'familymanage': + $in["action"] = WRENCHBOARD_FAMILY_MANAGE; + break; + case 'jobmanageroffers': $in["action"] = WRENCHBOARD_JOB_OFFERS; break;