add todo, fixed small things

.clang-format

@@ -5,7 +5,7 @@ IndentWidth: 4
 
 Language: Cpp
 PointerAlignment: Left
-ColumnLimit: 80
+ColumnLimit: 100
 AlignAfterOpenBracket: Align 
 AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: true

Admin.cpp

@@ -0,0 +1,36 @@
+#include "headers/Admin.h"
+using std::to_string;
+
+Admin::Admin(string name_, string password_)
+    : id{auto_increment_db() + 1}, name{name_}, password{hash_password(password_)} {
+    save_db();
+}
+
+Admin::Admin(int id_, string name_, string password_) : id{id_}, name{name_}, password{password_} {}
+
+void Admin::save_db() {
+    string statement{"insert into Admin values (, '', '');"};
+    statement.insert(33, password);
+    statement.insert(29, name);
+    statement.insert(26, to_string(id));
+    SQLite::Transaction transaction(data::db);
+    data::db.exec(statement);
+    transaction.commit();
+}
+
+void Admin::update_db() {
+    string statement = "UPDATE Admin SET name = '', password = '' where id = '';";
+    statement.insert(54, to_string(id));
+    statement.insert(40, password);
+    statement.insert(25, name);
+    data::db.exec(statement);
+}
+
+int Admin::auto_increment_db() {
+    SQLite::Statement max_id(data::db, "select max(id) from Admin;");
+    int id = 0;
+    max_id.executeStep();
+    id = max_id.getColumn(0);
+    max_id.reset();
+    return id;
+}

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14)
+cmake_minimum_required(VERSION 3.10)
 project(park)
 
 set(CMAKE_CXX_STANDARD 11)
@@ -11,18 +11,24 @@ include_directories(
 
 add_executable(park
         main.cpp
+
         data.cpp
         headers/data.h
+        encrypt.cpp
+        headers/encrypt.h
+
         Customer.cpp
         headers/Customer.h 
         Park_spot.cpp
         headers/Park_spot.h
         Park_time.cpp
         headers/Park_time.h
-        encrypt.cpp
-        headers/encrypt.h
+        Admin.cpp
+        headers/Admin.h
         Query.cpp
         headers/Query.h
+        Interface.cpp
+        headers/Interface.h
  )
 
 
@@ -34,7 +40,7 @@ if (UNIX)
         sqlite3
         pthread
         dl 
-        libsodium
+        sodium
         )
 elseif (MSYS OR MINGW) 
         target_link_libraries(park

Customer.cpp

@@ -1,20 +1,24 @@
 #include "headers/Customer.h"
 
+
 // constructors
-Customer::Customer(string name_, string password_, Verhicle_type verhicle_)
-    : name{name_}, verhicle{verhicle_}, password{hash_password(password)} {
-    id = auto_increment_db() + 1;
+Customer::Customer(string name_, string password_, Vehicle_type vehicle_, string telephone_)
+    : id{auto_increment_db() + 1},
+      name{name_},
+      password{hash_password(password_)},
+      vehicle{vehicle_},
+      telephone{telephone_} {
     save_db();
 }
 
-Customer::Customer(int id_, string name_, string password_,
-                   Verhicle_type verhicle_, vector<Park_time> instances)
+Customer::Customer(int id_, string name_, string password_, Vehicle_type vehicle_,
+                   vector<Park_time> instances, string telephone_)
     : id{id_},
       name{name_},
       password{password_},
-      verhicle{verhicle_},
-      park_instances{instances} {}
-
+      vehicle{vehicle_},
+      park_instances{instances},
+      telephone{telephone_} {}
 
 // clock in/out methods
 // ====================================================================================
@@ -31,28 +35,33 @@ void Customer::clock_out(int s_id) {
     park_instances[park_instances.size() - 1].clock_out(id, s_id);
 }
 
-// report gen
-void Customer::gen_monthly() {
-    cout << "NAME: " << name << "\n";
-    cout << "-------------------------------------------------\n";
-    for (auto& i : park_instances) {
-        // TODO: need some logic to only include from this month. scratch that,
-        // need to remove gen monthly
-        cout << i;
+bool Customer::parked() {
+    if (!park_instances.size()) {
+        return false;
     }
-    cout << "-------------------------------------------------\n\n";
+    if ((park_instances[park_instances.size() - 1].duration)) {
+        // if duration of the last parktime == 0, meaning
+        // that the customer has not clocked out
+        return false;
+    } else {
+        return true;
     }
+}
+
+int Customer::parked_at() { return park_instances[park_instances.size() - 1].spot_id; }
 
 //================================================================================================
 // functions that interact with the database
 
 void Customer::save_db() {
-    string statement{"insert into Customer values (, '', '', );"};
+    string statement{"insert into Customer values (, '', '', ,'');"};
     // after ( = 28)
-    statement.insert(38, to_string(int(verhicle)));
+    statement.insert(41, telephone);
+    statement.insert(38, to_string(int(vehicle)));
     statement.insert(36, password);
     statement.insert(32, name);
     statement.insert(29, to_string(id));
+    // cout << statement;
     SQLite::Transaction transaction(data::db);
     data::db.exec(statement);
     transaction.commit();
@@ -60,10 +69,14 @@ void Customer::save_db() {
 
 void Customer::update_db() {
     string statement =
-        "UPDATE Customer SET name = '', card_code = '' where id = '';";
-    statement.insert(58, to_string(id));
-    statement.insert(44, password);
+        "UPDATE Customer SET name = '', password = '', "
+        "vehicle = '', telephone = '' where id = '';";
+    statement.insert(87, to_string(id));
+    statement.insert(73, telephone);
+    statement.insert(57, to_string(int(vehicle)));
+    statement.insert(43, password);
     statement.insert(28, name);
+    // cout << statement;
     data::db.exec(statement);
 }
 
@@ -83,5 +96,3 @@ int Customer::auto_increment_db() {
     max_id.reset();
     return id;
 }
-
-

Interface.cpp

@@ -0,0 +1,218 @@
+#include "headers/Interface.h"
+
+
+// I added it to pass spots, because the parking options need it to check where
+// is free parking_spots is declared in main, and if i declare it
+// liberal use of
+// cin.ignore(10000, '\n');
+// so it skips to the next newline, in essence clearing the cin buffer
+
+void interface(vector<Park_spot>& spots) {
+    int selector;
+    cout << "\nHello and welcome to the parking spot! Please select a suitable "
+            "option:";
+    cout << "\n[1]Log in as member";
+    cout << "\n[2]Log in as administrator";
+    cin >> selector;
+    cin.ignore(10000, '\n');
+    switch (selector) {
+    case 1: {
+        interface_member(spots);
+        break;
+    }
+    case 2: {
+        interface_admin(spots);
+        break;
+    }
+    }
+}
+
+void interface_member(vector<Park_spot>& spots) {
+    int id;
+    string password;
+    cout << "\nPlease input id:";
+    cin >> id;
+    cin.ignore(10000, '\n');
+    Customer c = query_customer_with_id(id);
+    cout << "\nPlease input password:";
+    std::getline(cin, password);
+    while (!(verify_password(c.password, password))) {
+        cout << "ERROR: wrong password. Please retype your password:\n";
+        std::getline(cin, password);
+    }
+
+    cout << "Logged in succesfully\n";
+    cout << "select an option\n [1] Parking options\n[2]monthy report\n";
+    int option;
+    cin >> option;
+    cin.ignore(10000, '\n');
+    switch (option) {
+    case 1: {
+        park(c, spots);
+        break;
+    }
+    case 2: {
+        cout << "Has not been implemented yet\n";
+        break;
+    }
+
+    default:
+        break;
+    }
+}
+
+void interface_admin(vector<Park_spot>& spots) {
+    int id;
+    string password;
+    cout << "\nPlease input id:";
+    cin >> id;
+    cin.ignore(10000, '\n');
+    cin.clear();
+    Admin admin = query_admin_with_id(id);
+    cout << "\nPlease input password:";
+    std::getline(cin, password);
+    while (!(verify_password(admin.password, password))) {
+        cout << "ERROR: wrong password. Please retype your password:\n";
+        std::getline(cin, password);
+    }
+
+    cout << "Logged in succesfully\n";
+    cout << "Welcome to the admin interface. It is not completely ready yet.\n";
+    cout << "[1] See monthly report of ALL parking spots\n";
+    cout << "[2] See weekly report of ALL parking spots\n";
+    cout << "[3] See monthly report of a specific parking spot\n";
+    cout << "[4] See weekly report of a specific parking spot\n";
+    cout << "[5] See current status of parking spots\n";
+    cout << "[6] Make new customer\n";
+    cout << "[7] Make new parking spot\n";
+    cout << "[8] Make new Admin\n";
+    cout << "option[1-8]:";
+    int option;
+    cin >> option;
+    cin.ignore(10000, '\n');
+    switch (option) {
+    case 1: {
+        reports_from_allparkspots();
+        break;
+    }
+    case 2: {
+        reports_from_allparkspots(true);
+        break;
+    }
+    case 3: {
+        cout << "Which parking spot would you like a report on?ID:";
+        int spotid;
+        cin >> spotid;
+        cin.ignore(10000, '\n');
+        reports_from_parkspot(spotid);
+        break;
+    }
+    case 4: {
+        cout << "Which parking spot would you like a report on?ID:";
+        int spotid;
+        cin >> spotid;
+        cin.ignore(10000, '\n');
+        reports_from_parkspot(spotid, true);
+        break;
+    }
+    case 5: {
+        current_status_parkspots(spots);
+        break;
+    }
+    case 6: {
+        new_customer();
+        break;
+    }
+    case 7: {
+        new_parkspot(spots);
+        break;
+    }
+    case 8: {
+        new_admin();
+        break;
+    }
+
+    default:
+        break;
+    }
+}
+
+// --------- individual things.
+
+void park(Customer& c, vector<Park_spot>& spots) {
+    cout << "You have selected parking option";
+    if (!(c.parked())) {
+        cout << "The following spots[which can fit your vehicle] are "
+                "available: ";
+        for (Park_spot i : spots) {
+            if (i.v_type == c.vehicle && !(i.taken)) {
+                cout << i.id << ", ";
+            }
+        }
+
+        cout << "where do you want to park?";
+        int parkid;
+        cin >> parkid;
+        cin.ignore(10000, '\n');
+        for (Park_spot& i : spots) {
+            if (i.id == parkid) {
+                i.clock(c);
+                cout << "You have parked sucessfully";
+            }
+        }
+
+    } else {
+        cout << "You are parked at spot " << c.parked_at()
+             << ", do you want to clock out?\n enter [1] for yes and [0] for no";
+        int answer = 0;
+        cin >> answer;
+        cin.ignore(10000, '\n');
+        if (answer) {
+            query_parkspot_with_id(c.parked_at(), spots).clock(c);
+            cout << "You have sucessfully clocked out.";
+        } else {
+            cout << "OK, have a nice day";
+        }
+    }
+}
+
+void new_customer() {
+    int vtype;
+    string name;
+    string password;
+    string telephone;
+    cout << "What's the name of the customer? ";
+    std::getline(cin, name);
+    cout << "What's the vehicle type? [1]twoweeler, [2] fourweeler: ";
+    cin >> vtype;
+    cin.ignore(10000, '\n');
+    cout << "What's the telephone number? ";
+    std::getline(cin, telephone);
+    cout << "What's the password?";
+    std::getline(cin, password);
+    Customer newcustomer{name, password, Vehicle_type(vtype), telephone};
+    cout << "New customer sucessfully created\n";
+    newcustomer.update_db();
+}
+
+void new_admin() {
+    string name;
+    string password;
+    cout << "What's the name of the admin? ";
+    std::getline(cin, name);
+    cout << "What's the password?";
+    std::getline(cin, password);
+    Admin newadmin{name, password};
+    cout << "New admin sucessfully created\n";
+    newadmin.update_db();
+}
+
+void new_parkspot(vector<Park_spot>& spots) {
+    cout << "What type of parking spot? [1] twoweeler, [2] fourweeler: ";
+    int vtype;
+    cin >> vtype;
+    cin.ignore(10000, '\n');
+    Park_spot newspot{Vehicle_type(vtype)};
+    spots.push_back(newspot);
+    cout << "new parking spot sucessfully created.\n";
+}

Park_spot.cpp

@@ -2,30 +2,30 @@
 
 // constructors
 
-Park_spot::Park_spot()
-    : parked{nullptr}, id{auto_increment_db() + 1}, taken{false} {
+Park_spot::Park_spot(Vehicle_type v_type_)
+    : parked_customer{0}, id{auto_increment_db() + 1}, taken{false}, v_type{v_type_} {
     save_db();
 }
 
-Park_spot::Park_spot(Customer* parked_, int id_, bool taken_)
-    : parked{nullptr},
+Park_spot::Park_spot(int id_, bool taken_, int parked, Vehicle_type v_type_)
+    : parked_customer{parked},
       id{id_},
+      v_type{v_type_},
       taken{taken_} // TODO: think about how init parked?
 {}
 
-
 // clock in en out, calls de juist(in/out) van de customer aan de hand van
 // internal state van taken
-void Park_spot::clock(Customer* c_customer) {
+void Park_spot::clock(Customer& c_customer) {
     if (!taken) {
-        parked = c_customer;
+        parked_customer = c_customer.id;
         taken = true;
-        parked->clock_in(id);
+        c_customer.clock_in(id);
         update_db();
     } else {
         taken = false;
-        parked->clock_out(id);
-        parked = nullptr;
+        c_customer.clock_out(id);
+        parked_customer = 0;
         update_db();
     }
 }
@@ -33,11 +33,10 @@ void Park_spot::clock(Customer* c_customer) {
 // --------------------- db functs
 
 void Park_spot::update_db() {
-    string statement =
-        "UPDATE Park_spot SET taken = '', customer_id  = '' where id = '';";
+    string statement = "UPDATE Park_spot SET taken = '', customer_id  = '' where id = '';";
     statement.insert(63, to_string(id));
     if (taken) {
-        statement.insert(49, to_string(parked->id));
+        statement.insert(49, to_string(parked_customer));
         statement.insert(30, "1");
     } else {
         statement.insert(49, "NULL");
@@ -48,8 +47,9 @@ void Park_spot::update_db() {
 
 void Park_spot::save_db() {
     //(int id, bool taken, int customer_id)
-    string statement{"insert into Park_spot values ( , , );"};
+    string statement{"insert into Park_spot values ( , , , );"};
     // after ( = 28)
+    statement.insert(36, to_string(int(v_type)));
     statement.insert(34, "NULL");
     statement.insert(32, "0");
     statement.insert(30, to_string(id));

Park_time.cpp

@@ -1,5 +1,13 @@
 #include "headers/Park_time.h"
 
+/*
+initializes everything, id is auto incremented from what's stored in the db.
+inmediately saves to db upon creation.
+Also, this weird syntax is called an initializer list, and is the preffered
+method of how to initialize members. It has a measurable performance increase
+because it uses move semantics instead of copy semantics.
+https://www.geeksforgeeks.org/when-do-we-use-initializer-list-in-c/
+ */
 Park_time::Park_time(int c_id, int s_id)
     : customer_id{c_id},
       spot_id{s_id},
@@ -8,18 +16,22 @@ Park_time::Park_time(int c_id, int s_id)
       id{auto_increment_db() + 1} {
     save_db();
 }
-
-Park_time::Park_time(int id_, int customer_id_, int spot_id_, int start_,
-                     int duration_)
-    : id{id_},
-      customer_id{customer_id_},
-      spot_id{spot_id_},
-      duration{duration_} {
+/*
+this one initializes with data from the database. should probably only be used in the query
+functions.
+ */
+Park_time::Park_time(int id_, int customer_id_, int spot_id_, int start_, int duration_)
+    : id{id_}, customer_id{customer_id_}, spot_id{spot_id_}, duration{duration_} {
     start = time_point<system_clock>(seconds(start_));
     end = time_point<system_clock>(seconds(start_ + duration_));
 }
 
+/*
+simple checking if customer is clocking out at the right spot.
+sets end(time of clocking out) and calculates the duration.
+updates the info in the database.
 
+ */
 void Park_time::clock_out(int c_id, int s_id) {
 
     if (c_id != customer_id) {
@@ -33,8 +45,7 @@ void Park_time::clock_out(int c_id, int s_id) {
 
     if (!duration) {
         end = high_resolution_clock::now();
-        duration =
-            duration_cast<seconds>(end - start).count(); // use mins later
+        duration = duration_cast<seconds>(end - start).count(); // use mins later
         update_db();
 
     } else {
@@ -46,13 +57,15 @@ std::ostream& operator<<(std::ostream& os, const Park_time& pt) {
     std::time_t start_ = system_clock::to_time_t(pt.start);
     std::time_t end_ = system_clock::to_time_t(pt.end);
     os << "- - - - - - - - - - - - - - - - - - - -\n";
+    os << "Customer # " << pt.customer_id << "at parking spot " << pt.spot_id << "\n";
     os << "Clocked in :" << std::ctime(&start_);
     os << "clocked out : " << std::ctime(&end_);
     os << "duration : " << pt.duration << "\n";
     os << "- - - - - - - - - - - - - - - - - - - -\n";
     return os;
 }
-
+// mostly a helper function to ease the conversion from timepoint to int
+// for storing in the db
 int Park_time::start_to_int() {
     auto start_to_epoch = start.time_since_epoch();
     auto start_value = duration_cast<seconds>(start_to_epoch);
@@ -64,6 +77,9 @@ int Park_time::start_to_int() {
 // -----------------------------------------------------------------------------
 
 void Park_time::save_db() {
+    /*
+    this creates a sql statement and then executes it
+     */
     string statement{"insert into Park_time values ( , , , , , );"};
     statement.insert(41, "NULL");
     statement.insert(39, "NULL");
@@ -75,10 +91,9 @@ void Park_time::save_db() {
     data::db.exec(statement);
     transaction.commit();
 }
-
+// same as above
 void Park_time::update_db() {
-    string statement =
-        "UPDATE Park_time SET end = , duration =  where id = '';";
+    string statement = "UPDATE Park_time SET end = , duration =  where id = '';";
     statement.insert(53, to_string(id));
     statement.insert(40, to_string(duration));
     statement.insert(27, to_string(start_to_int() + duration));
@@ -94,3 +109,16 @@ int Park_time::auto_increment_db() {
     max_id.reset();
     return id;
 }
+
+//------------------ test function to help test this
+
+void Wait(int sec)
+
+{
+    /*
+a wait function where 1 sec represents 1 hour irl. It has been used for testing
+purposes mostly. TODO: Needs to be removed at completion of project, or seperated in a test
+cpp/header
+ */
+    std::this_thread::sleep_for(seconds{sec});
+}

Query.cpp

@@ -1,6 +1,5 @@
 #include "headers/Query.h"
 
-
 vector<Park_time> query_parktimes_for_customer(int cid) {
     /*
     This is needed to initialize the park_instances for the customer constructor
@@ -9,8 +8,7 @@ vector<Park_time> query_parktimes_for_customer(int cid) {
      */
     vector<Park_time> park_times;
 
-    SQLite::Statement query(data::db,
-                            "SELECT * FROM Park_time WHERE customer_id = ?;");
+    SQLite::Statement query(data::db, "SELECT * FROM Park_time WHERE customer_id = ?;");
     query.bind(1, cid);
     while (query.executeStep()) {
         int id = query.getColumn(0);
@@ -25,6 +23,8 @@ vector<Park_time> query_parktimes_for_customer(int cid) {
     return park_times;
 }
 
+//--------------------------------------------- customers
+
 vector<Customer> query_customer_with_name(string name) {
     /*
     We use this instead of plain customers because:
@@ -32,18 +32,18 @@ vector<Customer> query_customer_with_name(string name) {
     2. multiple customers could be returned with the same name.
      */
     vector<Customer> result;
-    SQLite::Statement query(
-        data::db,
-        "SELECT id, name, password, verhicle FROM Customer WHERE name = ?;");
+    SQLite::Statement query(data::db,
+                            "SELECT id, name, password, vehicle FROM Customer WHERE name = ?;");
     query.bind(1, name);
     while (query.executeStep()) {
         int id = query.getColumn(0);
         string name_ = query.getColumn(1);
         string password = query.getColumn(2);
-        int verhicle = query.getColumn(3); // cast to verhicle
+        int vehicle = query.getColumn(3); // cast to vehicle
+        string telephone = query.getColumn(4);
         vector<Park_time> park_instances = query_parktimes_for_customer(id);
-        result.push_back(Customer{
-            id, name_, password, Verhicle_type(verhicle), park_instances});
+        result.push_back(
+            Customer{id, name_, password, Vehicle_type(vehicle), park_instances, telephone});
     }
     return result;
 }
@@ -61,38 +61,125 @@ Customer query_customer_with_id(int id) {
     while (query.executeStep()) {
         string name = query.getColumn(1);
         string password = query.getColumn(2);
-        int verhicle = query.getColumn(3); // cast to verhicle
+        int vehicle = query.getColumn(3); // cast to vehicle
+        string telephone = query.getColumn(4);
         vector<Park_time> park_instances = query_parktimes_for_customer(id);
-        Customer result{
-            id, name, password, Verhicle_type(verhicle), park_instances};
-        // DEBUG
-        cout << "{" << result.id << "," <<result.password <<"," << int(verhicle) << "}\n";
+        Customer result{id, name, password, Vehicle_type(vehicle), park_instances, telephone};
         return result;
     }
 }
 
-void query_all_parking_spots() {
-    SQLite::Statement query(data::db, "SELECT * FROM Park_spot WHERE id > ?;");
-    query.bind(1, 0);
+//----------------- ADMIN
+
+Admin query_admin_with_id(int id) {
+
+
+    SQLite::Statement query(data::db, "SELECT * FROM Customer WHERE id = ?;");
+    query.bind(1, id);
+    while (query.executeStep()) {
+        string name = query.getColumn(1);
+        string password = query.getColumn(2);
+        Admin result{id, name, password};
+        return result;
+    }
+}
+
+
+//------------------------------- parkspot info
+
+Park_spot query_parkspot_with_id(int id, vector<Park_spot>& parkspots) {
+    for (Park_spot& i : parkspots) {
+        if (i.id == id) {
+            return i;
+        }
+    }
+}
+
+void reports_from_parkspot(int spotid, bool weekly) {
+    std::time_t t = std::time(0); // get time now
+    std::tm* now = std::localtime(&t);
+
+    if (weekly) {
+        now->tm_wday = 1;
+    } else {
+        now->tm_mday = 1;
+    }
+
+    int s_since_epoch = mktime(now);
+
+    vector<Park_time> park_times;
+    SQLite::Statement query(data::db, "SELECT * FROM Park_time WHERE spot_id = ? AND start > ?;");
+    query.bind(1, spotid);
+    query.bind(2, s_since_epoch);
     while (query.executeStep()) {
         int id = query.getColumn(0);
-        int taken = query.getColumn(1);
-        int cid = query.getColumn(2);
-        park_customers.push_back(query_customer_with_id(cid));
-        parking_spots.push_back(
-            Park_spot{get_customer_ptr_for_parkspot(cid), id, bool(taken)});
+        int cid = query.getColumn(1);
+        int start = query.getColumn(3);
+        int duration = query.getColumn(5);
+        Park_time result{id, cid, spotid, start, duration};
+        park_times.push_back(result);
+    }
+    query.reset();
+
+    for (auto i : park_times) {
+        cout << i;
     }
 }
 
-Customer* get_customer_ptr_for_parkspot(int id) {
-    if (!id) {
-        return nullptr;
+void reports_from_allparkspots(bool weekly) {
+    std::time_t t = std::time(0); // get time now
+    std::tm* now = std::localtime(&t);
+    if (weekly) {
+        now->tm_wday = 1;
+    } else {
+        now->tm_mday = 1;
     }
-    for (int i = 0; i < park_customers.size(); i++) {
-        if (park_customers[i].id == id) {
 
-            return &park_customers[i];
+    int s_since_epoch = mktime(now);
+
+    vector<Park_time> park_times;
+    SQLite::Statement query(data::db, "SELECT * FROM Park_time WHERE start > ?;");
+    query.bind(1, s_since_epoch);
+    while (query.executeStep()) {
+        int id = query.getColumn(0);
+        int cid = query.getColumn(1);
+        int spotid = query.getColumn(2);
+        int start = query.getColumn(3);
+        int duration = query.getColumn(5);
+        Park_time result{id, cid, spotid, start, duration};
+        park_times.push_back(result);
+    }
+    query.reset();
+
+    for (auto i : park_times) {
+        cout << i;
     }
 }
-    return nullptr;
+
+void current_status_parkspots(vector<Park_spot>& spots) {
+    for (auto& i : spots) {
+        cout << "---------------------------\n";
+        cout << "PS #" << i.id << "\n";
+        cout << "Taken: " << ((i.taken) ? "true" : "false") << "\n";
+        if (i.taken) {
+            cout << "Customer#" << i.parked_customer << "  parked there\n";
         }
+    }
+}
+
+// -------------- paroking spots
+
+// vector<Park_spot> populate_spots(){
+//         vector<Park_spot> spots;
+//     SQLite::Statement query(data::db, "SELECT * FROM Park_spot WHERE id >
+//     0;");
+//     // query.bind(1, 2);
+//     while (query.executeStep()) {
+//         int id = query.getColumn(0);
+//         int taken = query.getColumn(1);
+//         int cid = query.getColumn(2);
+//         // park_customers.push_back(query_customer_with_id(cid));
+//         spots.push_back({id, taken, cid});
+//     }
+//     return spots;
+// }

data.cpp

@@ -3,20 +3,29 @@
 namespace data {
 
 SQLite::Database start_db() {
-    SQLite::Database db("test.db3",
-                        SQLite::OPEN_READWRITE | SQLite::OPEN_CREATE);
+    /*
+    Opens the database, creates it if it can't find the file.
+     */
+    SQLite::Database db("test.db3", SQLite::OPEN_READWRITE | SQLite::OPEN_CREATE);
     while (sodium_init() < 0) {
         std::cout << "SODIUM NOT WORKING";
+        /*
+        This shouldn't be here, really, but I can't think of a better place
+        where it runs at least once. This seeds the random generator needed for
+        salts and other stuff, and needs to be run at least once when working
+        with any libsodium function.
+         */
     }
     db.exec(
         "create table if not exists Customer (id integer primary key, name "
-        "text, password text, verhicle int)");
+        "text, password text, vehicle int, telephone text);");
     db.exec(
         "create table if not exists Park_spot (id integer primary key, taken "
-        "int, customer_id int)");
+        "int, customer_id int, vehicle_type int);");
     db.exec(
         "create table if not exists Park_time (id integer primary key, "
-        "customer_id int, spot_id int, start int, end int, duration int)");
+        "customer_id int, spot_id int, start int, end int, duration int);");
+    db.exec("create table if not exists Admin (id int primary key, name text, password text);");
 
     return db;
 }

encrypt.cpp

@@ -1,33 +1,35 @@
 #include "headers/encrypt.h"
 
-
 string hash_password(string password) {
     /*
     Passing strings and converting to char* because I do not want to be forced
     to use char * whenever I want to call the function. Low level stuff in the
     function, the least possible low level stuff outside.
+    This uses the password hashing algorithm Argon2 implemented by libsodium.
+    DO NOT MODIFY memory_limit and cpu_limit after you add customers to the db.
+    When you do that, the hashed passwords can't be decrypted, and that would be
+    BAD
      */
     const char* password_ = password.c_str();
     char hashed_password_[crypto_pwhash_STRBYTES];
-    int memory_limit = 1.28e+8; // 1.28 e+8 = 128 e6 = 128 mb
-    int cpu_limit = 2;          // this is n_threads
+    int memory_limit = 3.2e+7; // 3.2e7 = 32e6 = 32 mb
+    int cpu_limit = 1;         // this is n_threads
 
-    int result = crypto_pwhash_str(hashed_password_,
-                                   password_,
-                                   strlen(password_),
-                                   cpu_limit,
-                                   memory_limit);
+    int result =
+        crypto_pwhash_str(hashed_password_, password_, strlen(password_), cpu_limit, memory_limit);
     string hashed_password{hashed_password_};
 
     return hashed_password;
 }
 
 bool verify_password(string hashed_password, string unhashed_password) {
+    /*
+    this verifies the password. It's encryption magic and don't question it.
+     */
     const char* password_ = unhashed_password.c_str();
     const char* hashed_password_ = hashed_password.c_str();
 
-    if (crypto_pwhash_str_verify(
-            hashed_password_, password_, strlen(password_)) != 0) {
+    if (crypto_pwhash_str_verify(hashed_password_, password_, strlen(password_)) != 0) {
         return false;
     } else {
         return true;

headers/Admin.h

@@ -0,0 +1,21 @@
+#ifndef ADMIN_H
+#define ADMIN_H
+#pragma once
+
+#include "data.h"
+
+class Admin {
+  public:
+    int id;
+    string name;
+    string password;
+    Admin(string name_, string password_);
+    Admin(int id_, string name_, string password);
+
+//   private:
+    void update_db();
+    void save_db();
+    int auto_increment_db();
+};
+
+#endif // CUSTOMER_H

headers/Customer.h

@@ -3,52 +3,57 @@
 #pragma once
 
 #include "Park_time.h"
-#include "data.h"
+
 #include <vector>
 
 using std::vector;
 
-// will make it easy to represent it in the database while making it easy to use
-// while programming
-enum class Verhicle_type { bike = 1, small_car = 2, suv = 3, pickup = 4 };
+/*
+enum classes make it easy to represent categories.
+So you can use something like Vehicle_type::car instead of 2. but under the
+hood, it's still an int. This is here so you won't have to have global variables
+for these categories, or worse, use magic numbers in the code.
+
+ */
+enum class Vehicle_type { twoweeler = 1, fourweeler = 2 };
 
 /*
-card code is een randomly generated string moeten zijn, die je bv. op een nfc
-card zou opslaan en zo zou authenticaten bij je parking spot. We kunnen dit ipv
-of samen met een password gebruiken. clock in en out creeert en compleet een
-park_time object. Voegt het toe aan een vector.
+Customer constructors do the same stuff as all the other constructors.
+clock_in and out create and modify park_time objects and store them to
+park_instances. Technically, now that we have a working db, we don't need it.
+TODO: fix this.
 
+gen_monthly just prints out all the park_time objects in park_instances.
+It should (and can safely) be removed, but it's here as a quick example of
+report generation It has no logic to speak of that only generates report of
+ptime objects of this month.
+TODO: remove when have seperate report generation functions.
+
+save, update, delete and auto increment are the same as in park_time.
  */
 
 class Customer {
   public:
-
     int id;
     string name;
     string password;
-    Customer(string name_, string password_, Verhicle_type verhicle_);
-    Customer(int id_, string name_, // needed to construct from db
-             string password_,
-             Verhicle_type verhicle_, // TODO: how init. p_time instances?
-             vector<Park_time> instances);
+    Vehicle_type vehicle;
+    string telephone;
+    Customer(string name_, string password_, Vehicle_type vehicle_, string telephone_);
+    Customer(int id_, string name_, string password_, Vehicle_type vehicle_,
+             vector<Park_time> instances, string telephone_);
     void clock_in(int s_id);
     void clock_out(int s_id);
+    bool parked();
+    int parked_at();
 
     void update_db();
     void delete_db();
 
-    void gen_monthly(); // remove, make it a function in data
-
   private:
-    Verhicle_type verhicle;
     vector<Park_time> park_instances;
     void save_db();
     int auto_increment_db();
 };
 
-static vector<Customer> park_customers; // save the customers that are parked in here
-// parking_spot uses pointers, so it's better to save the parked customers here
-// where we know they'll be destroyed at the end of this scope, instead of too early
-// and end up with dangling pointers
-
 #endif // CUSTOMER_H

headers/Interface.h

@@ -0,0 +1,14 @@
+
+
+#include "Query.h"
+
+
+using std::cin;
+
+void interface(vector<Park_spot>& spots);
+void interface_member(vector<Park_spot>& spots);
+void interface_admin(vector<Park_spot>& spots);
+void park(Customer& c, vector<Park_spot>& spots);
+void new_customer();
+void new_parkspot(vector<Park_spot>& spots);
+void new_admin();

headers/Park_spot.h

@@ -1,5 +1,8 @@
-#include "Customer.h"
+#ifndef PARK_SPOT_H
+#define PARK_SPOT_H
+#pragma once
 
+#include "Customer.h"
 /*
 db representation:
 int id not null
@@ -14,10 +17,12 @@ class Park_spot {
   public:
     int id;
     bool taken;
-    Customer* parked;
-    Park_spot();
-    Park_spot(Customer* parked_, int id_, bool taken_);
-    void clock(Customer* c_customer);
+    int parked_customer;
+    Vehicle_type v_type;
+
+    Park_spot(Vehicle_type v_type_);
+    Park_spot(int id_, bool taken_, int parked, Vehicle_type v_type_);
+    void clock(Customer& c_customer);
 
   private:
     void save_db();
@@ -25,5 +30,4 @@ class Park_spot {
     void delete_db();
     int auto_increment_db();
 };
-
-static vector<Park_spot> parking_spots; // to save the parking spots in memory
+#endif // CUSTOMER_H

headers/Park_time.h

@@ -8,6 +8,7 @@
 #include <ctime>
 #include <iostream>
 #include <string>
+#include <thread>
 
 using namespace std::chrono;
 using std::cout;
@@ -17,13 +18,35 @@ using std::to_string;
 
 
 Record of who parked at what park_spot and at what time.
+public interface-------------------------------------------
+
+The constructors. one for creating new customers, the other one used by the
+query functions to construct the object from information stored in the database.
+
+clock_out is the function that gets called from customer.clock_out().
+It verifies that the customer is clocking out at the correct parkspot, and saves
+the current time of clocking out in end. It also calculates duration so it
+doesn't have to be calculated more than once.
+
+operator<< is << overload, can(should) be used for report generation.
+
+
+// implementation stuff------------------------
+start and end are time points representing when someone clocks in and out. they're from the chrono
+namespace.
+
+save and update save and update info in the database.
+auto_increment pulls the highest id stored in the db, to be used in the constructor.
+
+start_to_int() is used to convert the start timepoint to an integer that can be saved in the
+database SQL datetime and chrono datetime don't seem the most compatible.
+
 */
 
 class Park_time {
   public:
     Park_time(int c_id, int s_id);
-    Park_time(int id_, int customer_id_, int spot_id_, int start_,
-              int duration_);
+    Park_time(int id_, int customer_id_, int spot_id_, int start_, int duration_);
     int id;
     int customer_id;
     int spot_id;
@@ -41,4 +64,7 @@ class Park_time {
     int start_to_int();      // helper
 };
 
+// test funciton
+void Wait(int sec);
+
 #endif // Park_time

headers/Query.h

@@ -3,16 +3,62 @@
 #pragma once
 
 #include "Park_spot.h"
+#include "Admin.h"
 
-#include <array>
+/*these are the functions that search the database and create objects from it.
+
+query_parktimes_for_customer searches for the parktimes  that are needed in
+customer initialisaiton. generally, i see no use outside of that.
+
+query_customer_with_name searches for customer data by name.
+
+query_customer_with_id does what the above does, but with id.
+
+
+populate_spots is used to query for all the park_spots and return them as
+objects.
+
+The design desision to use vector<T> instead of <T> is for the following
+reasons:
+
+1. some of these can potentially return more than one object. For example, 2
+customers who have the same name.
+
+2. I have no clue how many of you have done error handling in c++
+(try/catch/finally).
+I dont want to bombard you with more new concepts than needed.
+so now you'd do
+
+vector<Customer> test = query_customer_with_name("Testman");
+
+if (!test.size()) {print no customers found, do stuff}
+else if (test.size() > 1) { do stuff to get the right one if you only need one
+}
+
+instead of
+try {
+    customer test = query_customer_with_name("Testman");
+}
+catch(someException.probablycalled_not_found) {do_Stuff};
+catch(...) {
+    do stuff
+}
+finally{
+    do more stuff
+}
+
+ */
 
 vector<Park_time> query_parktimes_for_customer(int cid);
 
 vector<Customer> query_customer_with_name(string name);
 Customer query_customer_with_id(int id);
-Customer* get_customer_ptr_for_parkspot(int id);
-
-void query_all_parking_spots(); // used for initializing the parking spots at start of the program
 
+Admin query_admin_with_id(int id);
 
+vector<Park_spot> populate_spots();
+Park_spot query_parkspot_with_id(int id, vector<Park_spot>& parkspots);
+void reports_from_parkspot(int spotid, bool weekly = false);
+void reports_from_allparkspots(bool weekly = false);
+void current_status_parkspots(vector<Park_spot>& spots);
 #endif // CUSTOMER_H

headers/data.h

@@ -5,8 +5,13 @@
 #include "encrypt.h"
 
 namespace data {
-SQLite::Database
-start_db();
+
+/*
+start_db is the function that opens the database, and
+if the necesary tables are not there, creates them.
+db is the database, and is static to avoid multiple redefinition errors.
+ */
+SQLite::Database start_db();
 static SQLite::Database db = start_db();
 
 } // namespace data

headers/encrypt.h

@@ -2,12 +2,20 @@
 #define ENCRYPT_H
 #pragma once
 
-#include <string>
 #include <cstring>
-#include <sodium.h>
 #include <iostream>
+#include <sodium.h>
+#include <string>
 
 using std::string;
+/*
+hash_password takes the password, and encrypts it. This needs to be done,
+because storing passwords in plaintext is BAD!
+
+verify_password takes in a password and the hashed password, and then does magic encryption
+stuff(no, not really. It basically hashes the password with the same salt and other parameters) and
+to see if the password stored and the given password match.
+ */
 
 string hash_password(string password);
 bool verify_password(string hashed_password, string unhashed_password);

main.cpp

@@ -1,57 +1,71 @@
-#include "headers/Query.h"
-
-#include <array>
-#include <thread>
+#include "headers/Interface.h"
+#include "headers/Admin.h"
 
 /*
-Code strucure like this:
-class declarations zijn in /headers/class_naam.h, en definitions van de member
-functs in /class_naam.cpp elke klas in zn eigen file omdat ik incomplete class
-declarations wilt tegengaan, omdat ik ze niet goed begrijp. En header/source
-split om multiple definition errors tegen te gaan.
+Code structure is like this:
+1. encrypt.cpp en /header/encrypt.h contain functions to hash passwords and
+verify passwords
 
-Park_spot representeert een parkeermeter bij elke parkeer spot.
-Een customer is een customer.
-Park time is een object die reffereert naar parkspot en customer, basically een
-record die zegt dat een customer voor x tijd geparkeert heeft bij spot x, enz.
+2. data.cpp and /header/data.h contain the code to start up the database.
+Originally, they were supposed to contain all the functions to save to the
+database and query from the database. I had trouble doing that, (cyclical
+includes) and some other issues. the other issues are gone due to the latest
+refactor, but to make it like my original plan is going to take a few hours, and
+I have done too much already to want to do more work unless needed.
+The functions to save to a database have been integrated in the classes
+themself, and unless issues arrise from that I'm not changing that. Functions to
+get objects from the database are in Query.cpp en header.
 
-De client clockt in en uit bij een spot.
+3. Park_time.cpp en header.
+Contain the implementation details of Park_time, which is basically a record of
+who parked at what spot and when. Uses a mix of ctime and chrono functions to do
+most of the stuff, it's a mess. I will probably have to commit to Doing it one
+way or the other to make it more comperhensible, especially for whoever will
+make report functions.
+
+4. Customer.cpp and header.
+Contains the implementation of Customer. Customer represents a customer, and
+saves park_time instances in itself. Not much to explain.
+
+5. Park_spot.cpp and header.
+It contians the implementation details of Park_spot, which represents it's
+namesake.
+
+6. Query.cpp and header.
+Cointain functions that search the database and return objects(P_time, P_spot,
+Customer) It is the least tested of the whole project, use with care.
+
+Explanation of what members do of P_time, P_spot, Customer are in the respective
+headers. Explanations of how the member functions work(Or how I intended for
+them to work) are in the respective .cpp files. void Wait(int sec)
  */
 
-
-
-
-void Wait(int sec)
-/*
-a wait function where 1 sec represents 1 hour irl.
- */
-{
-    std::this_thread::sleep_for(seconds{sec});
-}
-
-Customer* get_customer_ptr_for_parkspot(int id);
+static vector<Park_spot> parking_spots = populate_spots();
+// this queries the db for all the saved parking_spots and initializes them
+static vector<Customer> park_customers;
 
 int main() {
-    query_all_parking_spots();
-
-    Customer p0 = query_customer_with_name("Shaquile")[0];
-    Customer p1 = query_customer_with_name("Sagar Ramsaransing")[0];
-    Customer p2 = query_customer_with_name("Joshua karto")[0];
-    Customer p3 = query_customer_with_name("Stefan udit")[0];
-    
-    parking_spots[2].clock(&p1);
-    Wait(2);
-    parking_spots[2].clock(&p1);
-    Wait(1);
-    parking_spots[0].clock(&p2);
-    Wait(1);
-    parking_spots[1].clock(&p3);
-    Wait(1);
-    parking_spots[0].clock(&p2);
-    parking_spots[1].clock(&p3);
-    Wait(1);
-    parking_spots[1].clock(&p3);
-
-
+    // state of db:
+    // er zijn 5 parkspots, 2 met 2weeler en 4 met 4weeler
+    // er zijn customers met password "password"
+    // er is een admin id=1 met password PASSWORD
+    interface(parking_spots);
 }
 
+/*
+Why is this not in query.cpp? Because somehow, it errors out when it's there.
+The error message indicates it is a memory issue but I suspect it's a
+concurrency issue. Do not move this.
+ */
+vector<Park_spot> populate_spots() {
+    vector<Park_spot> spots;
+    SQLite::Statement query(data::db, "SELECT * FROM Park_spot WHERE id > 0;");
+    while (query.executeStep()) {
+        int id = query.getColumn(0);
+        int taken = query.getColumn(1);
+        int cid = query.getColumn(2);
+        Vehicle_type vtype = Vehicle_type(int(query.getColumn(3)));
+        spots.push_back({id, taken, cid, vtype});
+    }
+    return spots;
+}

readme.md

@@ -11,4 +11,30 @@ Or click the build icon in vscode *shrugs*
 
 # Parkmanne
 ## A stroll in the park
-Parkmanne aims to achieve provisionary effectiveness in the sector of parking. This problem had. 
+
+#TODO
+1. fix password of admin(probably buffer of input cusing the problem)
+2. add adress to customer
+3. billing
+4. delete/edit admin
+
+
+
+This is a graph of how everything is connected.
+If you need to add functionality that doesn't fall in any of these, and you're unsure of what to include, you can decide something like this:
+
+Take my customer class for example. 
+It needs to be able to save to db, so it needs data.
+It needs to modify and save park_time objects, so it needs those. 
+It needs to encrypt and decrypt passwords. BUT since data already includes encrypt, it doesn't have to be encrypted.
+So customer includes those.
+
+Another example is Parkspot.
+It needs information about both customers and save to the database.
+Since customer also includes data, i don't have to include it again.
+
+Last example:
+
+
+![header includes](graph.png)
+