scottk/wlan-cloud-owprov
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-owprov.git synced 2025-11-01 19:17:47 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Adding Signup Table

Browse Source
This commit is contained in:
stephb9959
2022-02-22 15:08:49 -08:00
parent d4a13d56bc
commit d9e9afef62
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/RESTAPI/RESTAPI_signup_handler.cpp
View File

@@ -32,11 +32,11 @@ namespace OpenWifi {
SignupDB::RecordVec SEs; SignupDB::RecordVec SEs;
if(StorageService()->SignupDB().GetRecords(0,100, SEs, "email='" + UserName + "'")) { if(StorageService()->SignupDB().GetRecords(0,100, SEs, "email='" + UserName + "'")) {
for(const auto &i:SEs) { for(const auto &i:SEs) {
if((i.created + Signup()->GracePeriod()) > OpenWifi::Now() && i.serialNumber==SerialNumber) { if((i.submitted + Signup()->GracePeriod()) > OpenWifi::Now() && i.serialNumber==SerialNumber) {
Poco::JSON::Object Answer; Poco::JSON::Object Answer;
i.to_json(Answer); i.to_json(Answer);
return ReturnObject(Answer); return ReturnObject(Answer);
} else if((i.created + Signup()->GracePeriod()) < OpenWifi::Now() && i.completed==0) { } else if((i.submitted + Signup()->GracePeriod()) < OpenWifi::Now() && i.completed==0) {
StorageService()->SignupDB().DeleteRecord("id", i.info.id); StorageService()->SignupDB().DeleteRecord("id", i.info.id);
} }
} }
@@ -80,7 +80,7 @@ namespace OpenWifi {
ProvObjects::SignupEntry SE; ProvObjects::SignupEntry SE;
SE.info.id = SignupUUID; SE.info.id = SignupUUID;
SE.info.created = SE.info.modified = SE.created = OpenWifi::Now(); SE.info.created = SE.info.modified = SE.submitted = OpenWifi::Now();
SE.completed = 0 ; SE.completed = 0 ;
SE.serialNumber = SerialNumber; SE.serialNumber = SerialNumber;
SE.error = 0 ; SE.error = 0 ;

4
src/RESTObjects/RESTAPI_ProvObjects.cpp
View File

@@ -608,7 +608,7 @@ namespace OpenWifi::ProvObjects {
RESTAPI_utils::field_to_json( Obj,"email", email); RESTAPI_utils::field_to_json( Obj,"email", email);
RESTAPI_utils::field_to_json( Obj,"userId", userId); RESTAPI_utils::field_to_json( Obj,"userId", userId);
RESTAPI_utils::field_to_json( Obj,"serialNumber", serialNumber); RESTAPI_utils::field_to_json( Obj,"serialNumber", serialNumber);
RESTAPI_utils::field_to_json( Obj,"created", created); RESTAPI_utils::field_to_json( Obj,"submitted", submitted);
RESTAPI_utils::field_to_json( Obj,"completed", completed); RESTAPI_utils::field_to_json( Obj,"completed", completed);
RESTAPI_utils::field_to_json( Obj,"status", status); RESTAPI_utils::field_to_json( Obj,"status", status);
RESTAPI_utils::field_to_json( Obj,"error", error); RESTAPI_utils::field_to_json( Obj,"error", error);
@@ -620,7 +620,7 @@ namespace OpenWifi::ProvObjects {
RESTAPI_utils::field_from_json( Obj,"email", email); RESTAPI_utils::field_from_json( Obj,"email", email);
RESTAPI_utils::field_from_json( Obj,"userId", userId); RESTAPI_utils::field_from_json( Obj,"userId", userId);
RESTAPI_utils::field_from_json( Obj,"serialNumber", serialNumber); RESTAPI_utils::field_from_json( Obj,"serialNumber", serialNumber);
RESTAPI_utils::field_from_json( Obj,"created", created); RESTAPI_utils::field_from_json( Obj,"submitted", submitted);
RESTAPI_utils::field_from_json( Obj,"completed", completed); RESTAPI_utils::field_from_json( Obj,"completed", completed);
RESTAPI_utils::field_from_json( Obj,"status", status); RESTAPI_utils::field_from_json( Obj,"status", status);
RESTAPI_utils::field_from_json( Obj,"error", error); RESTAPI_utils::field_from_json( Obj,"error", error);

2
src/RESTObjects/RESTAPI_ProvObjects.h
View File

@@ -391,7 +391,7 @@ namespace OpenWifi::ProvObjects {
std::string email; std::string email;
std::string userId; std::string userId;
std::string serialNumber; std::string serialNumber;
uint64_t created = 0 ; uint64_t submitted = 0 ;
uint64_t completed = 0 ; uint64_t completed = 0 ;
std::string status; std::string status;
uint64_t error=0; uint64_t error=0;

8
src/storage/storage_signup.cpp
View File

@@ -22,7 +22,7 @@ namespace OpenWifi {
ORM::Field{"email",ORM::FieldType::FT_TEXT}, ORM::Field{"email",ORM::FieldType::FT_TEXT},
ORM::Field{"userId",ORM::FieldType::FT_TEXT}, ORM::Field{"userId",ORM::FieldType::FT_TEXT},
ORM::Field{"serialNumber",ORM::FieldType::FT_TEXT}, ORM::Field{"serialNumber",ORM::FieldType::FT_TEXT},
ORM::Field{"created",ORM::FieldType::FT_BIGINT}, ORM::Field{"submitted",ORM::FieldType::FT_BIGINT},
ORM::Field{"completed",ORM::FieldType::FT_BIGINT}, ORM::Field{"completed",ORM::FieldType::FT_BIGINT},
ORM::Field{"status",ORM::FieldType::FT_TEXT} ORM::Field{"status",ORM::FieldType::FT_TEXT}
}; };
@@ -50,7 +50,7 @@ template<> void ORM::DB< OpenWifi::SignupDBRecordType, OpenWifi::ProvObjects:
Out.email = In.get<6>(); Out.email = In.get<6>();
Out.userId = In.get<7>(); Out.userId = In.get<7>();
Out.serialNumber = In.get<8>(); Out.serialNumber = In.get<8>();
Out.created = In.get<9>(); Out.submitted = In.get<9>();
Out.completed = In.get<10>(); Out.completed = In.get<10>();
Out.status = In.get<11>(); Out.status = In.get<11>();
} }
@@ -65,7 +65,7 @@ template<> void ORM::DB< OpenWifi::SignupDBRecordType, OpenWifi::ProvObjects:
Out.set<6>(In.email); Out.set<6>(In.email);
Out.set<7>(In.userId); Out.set<7>(In.userId);
Out.set<8>(In.serialNumber); Out.set<8>(In.serialNumber);
Out.set<9>(In.created); Out.set<9>(In.submitted);
Out.set<10>(In.created); Out.set<10>(In.completed);
Out.set<11>(In.status); Out.set<11>(In.status);
} }