From 70fcbc274bb75708e16d8cdd77a6dddf42eb6357 Mon Sep 17 00:00:00 2001
From: MassiveAtoms <s.ramsaransing.w@gmail.com>
Date: Sat, 6 Jul 2019 11:52:01 -0300
Subject: [PATCH 1/3] Fixing some stuff

---
 CMakeLists.txt      |   2 ++
 Customer.cpp        |  10 +++++-----
 Interface.cpp       |  40 ++++++++++++++++++++++++++++++++++++++++
 Query.cpp           |  12 ++++++------
 data.cpp            |   2 +-
 headers/Customer.h  |  10 +++++-----
 headers/Interface.h |   9 +++++++++
 headers/Park_spot.h |   1 +
 main.cpp            |  18 ++++++++----------
 old_test.db3        | Bin 16384 -> 0 bytes
 test.db3            | Bin 16384 -> 16384 bytes
 11 files changed, 77 insertions(+), 27 deletions(-)
 create mode 100644 Interface.cpp
 create mode 100644 headers/Interface.h
 delete mode 100644 old_test.db3

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f965e73..97671bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,8 @@ add_executable(park
         headers/Park_time.h
         Query.cpp
         headers/Query.h
+        Interface.cpp
+        headers/Interface.h
  )
 
 
diff --git a/Customer.cpp b/Customer.cpp
index ea435a0..f74c23f 100644
--- a/Customer.cpp
+++ b/Customer.cpp
@@ -1,18 +1,18 @@
 #include "headers/Customer.h"
 
 // constructors
-Customer::Customer(string name_, string password_, Verhicle_type verhicle_)
-    : name{name_}, verhicle{verhicle_}, password{hash_password(password_)} {
+Customer::Customer(string name_, string password_, Vehicle_type vehicle_)
+    : name{name_}, vehicle{vehicle_}, password{hash_password(password_)} {
     id = auto_increment_db() + 1;
     save_db();
 }
 
 Customer::Customer(int id_, string name_, string password_,
-                   Verhicle_type verhicle_, vector<Park_time> instances)
+                   Vehicle_type vehicle_, vector<Park_time> instances)
     :id{id_},
      name{name_},
       password{password_},
-      verhicle{verhicle_},
+      vehicle{vehicle_},
       park_instances{instances} {}
 
 
@@ -49,7 +49,7 @@ void Customer::gen_monthly() {
 void Customer::save_db() {
     string statement{"insert into Customer values (, '', '', );"};
     // after ( = 28)
-    statement.insert(38, to_string(int(verhicle)));
+    statement.insert(38, to_string(int(vehicle)));
     statement.insert(36, password);
     statement.insert(32, name);
     statement.insert(29, to_string(id));
diff --git a/Interface.cpp b/Interface.cpp
new file mode 100644
index 0000000..7829c04
--- /dev/null
+++ b/Interface.cpp
@@ -0,0 +1,40 @@
+#include "headers/Interface.h"
+
+void interface_member() {
+    int id;
+    string password;
+    cout << "\nPlease input id:";
+    cin >> id;
+    Customer c = query_customer_with_id(id);
+    cout << "\nPlease input password:";
+    cin >> password;
+    while (!(verify_password(c.password, password))){
+        cout << "ERROR: wrong password. Please retype your password \n";
+        cin >> password;
+    }
+    cout << "Logged in succesfully\n";
+
+    // if (verify_password(c.password, password)) {
+    //     cout << "\nLogged in successfully.";
+    // } else {
+    //     cout
+    //         << "Error, id and password combination not found, please try again.";
+    // }
+}
+
+void interface_admin() {}
+
+void interface() {
+    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;
+    switch (selector) {
+    case 1:
+        interface_member();
+    case 2:
+        interface_admin();
+    }
+}
diff --git a/Query.cpp b/Query.cpp
index 9e84a65..dbe898b 100644
--- a/Query.cpp
+++ b/Query.cpp
@@ -38,16 +38,16 @@ vector<Customer> query_customer_with_name(string name) {
     vector<Customer> result;
     SQLite::Statement query(
         data::db,
-        "SELECT id, name, password, verhicle FROM Customer WHERE name = ?;");
+        "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
         vector<Park_time> park_instances = query_parktimes_for_customer(id);
         result.push_back(Customer{
-            id, name_, password, Verhicle_type(verhicle), park_instances});
+            id, name_, password, Vehicle_type(vehicle), park_instances});
     }
     return result;
 }
@@ -65,12 +65,12 @@ 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
         vector<Park_time> park_instances = query_parktimes_for_customer(id);
         Customer result{
-            id, name, password, Verhicle_type(verhicle), park_instances};
+            id, name, password, Vehicle_type(vehicle), park_instances};
         // DEBUG
-        // cout << "{" << result.id << "," <<result.password <<"," << int(verhicle) << "}\n";
+        // cout << "{" << result.id << "," <<result.password <<"," << int(vehicle) << "}\n";
         return result;
     }
 }
diff --git a/data.cpp b/data.cpp
index f003491..be27c0d 100644
--- a/data.cpp
+++ b/data.cpp
@@ -20,7 +20,7 @@ SQLite::Database start_db() {
     //sql syntax is surprisingly readable.
     db.exec(
         "create table if not exists Customer (id integer primary key, name "
-        "text, password text, verhicle int)");
+        "text, password text, vehicle int)");
         // getting errors when using bool, so i used an int instead.
     db.exec(
         "create table if not exists Park_spot (id integer primary key, taken "
diff --git a/headers/Customer.h b/headers/Customer.h
index eb91e95..03ad182 100644
--- a/headers/Customer.h
+++ b/headers/Customer.h
@@ -11,12 +11,12 @@ using std::vector;
 
 /*
 enum classes make it easy to represent categories.
-So you can use something like Verhicle_type::car instead of 2. but under the
+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 Verhicle_type { bike = 1, small_car = 2, suv = 3, pickup = 4 };
+enum class Vehicle_type { bike = 1, small_car = 2, suv = 3, pickup = 4 };
 
 /*
 Customer constructors do the same stuff as all the other constructors.
@@ -38,8 +38,8 @@ class Customer {
     int id;
     string name;
     string password;
-    Customer(string name_, string password_, Verhicle_type verhicle_);
-    Customer(int id_, string name_, string password_, Verhicle_type verhicle_,
+    Customer(string name_, string password_, Vehicle_type vehicle_);
+    Customer(int id_, string name_, string password_, Vehicle_type vehicle_,
              vector<Park_time> instances);
     void clock_in(int s_id);
     void clock_out(int s_id);
@@ -48,7 +48,7 @@ class Customer {
     void delete_db();
 
     void gen_monthly();
-    Verhicle_type verhicle;
+    Vehicle_type vehicle;
 
   private:
     vector<Park_time> park_instances;
diff --git a/headers/Interface.h b/headers/Interface.h
new file mode 100644
index 0000000..104ba70
--- /dev/null
+++ b/headers/Interface.h
@@ -0,0 +1,9 @@
+
+
+#include "Query.h"
+
+using std::cin;
+
+void interface();
+void interface_member();
+void interface_admin();
\ No newline at end of file
diff --git a/headers/Park_spot.h b/headers/Park_spot.h
index 61a994c..e50dfdc 100644
--- a/headers/Park_spot.h
+++ b/headers/Park_spot.h
@@ -18,6 +18,7 @@ class Park_spot {
     int id;
     bool taken;
     int parked_customer;
+    
     Park_spot();
     Park_spot(int id_, bool taken_, int parked);
     void clock(Customer& c_customer);
diff --git a/main.cpp b/main.cpp
index 65a5058..7d88f59 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,4 +1,4 @@
-#include "headers/Query.h"
+#include "headers/Interface.h"
 
 #include <thread>
 
@@ -70,17 +70,15 @@ For now, it's just here in case you want an easy way to store customers.
  */
 
 int main() {
-    Customer sagar = query_customer_with_name("stefan udit")[0];
-    Customer sagar1 = query_customer_with_id(2);
-    cout << sagar.id << "," << sagar.name << "," << sagar.password << "\n";
-    cout << sagar1.id << "," << sagar1.name << "," << sagar1.password;
-    cout << parking_spots.size();
+    // er is een customer met id 1(testcustomer) met password "password"
+    
+    // Customer test {
+    //     "testcustomer", "password", Vehicle_type::bike
+    // };
+
+    interface();
 
-    for (auto i : parking_spots) {
-        cout << "\n" << i.id << "," << i.parked_customer;
-    }
 
-    populate_spots();
 }
 
 /*
diff --git a/old_test.db3 b/old_test.db3
deleted file mode 100644
index 108a7ad5250f75413fabe333ec9836c9061be779..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
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
ToGI{2hS_Oyb>VYBx1j$9vXJf=

diff --git a/test.db3 b/test.db3
index fb38b234038e83bd1e874342e5941455948e1791..6e83b13452cc5fa52980122413fb0f25f2951302 100644
GIT binary patch
delta 152
zcmZo@U~Fh$oFL7}GEv5vk!54T5`H#D{%!{T?#+q{jr=0TjBE_5jsBb^sl_G9rNt%r
zxv52yd*tOk%CqtU14>d0BJ^Ez@(T+}0}{jB3<FghE8Hs`!wka`^P`*sA}n3qQZltG
qBD4*RqFiz^vNBv9eagM_9evYGGXr@UfIwigpur9Pi4&CAP`LoFMlB%#

delta 636
zcmZvZJ8#-h6vwZ@K#)pqqo!)rhk{f(G1!oR!_a{egJbisF~J2XQZKO$#x@tfc%%#Y
z1Z|ZMP*v#{h&uFRWa?CP=u~Cs)S*(R8s?tiC!M3C-}y^twIWt4;@x9n_x+O!v3vdc
z6TBNwT><zDzJbZ@%k77$tLuxmse4{L4xU}K2+!AaG)V`l;a`5(+dJL&7P#0rmX%VD
zbt|?}Z&RW?%#7V8-7?&1qg*p<)$Ebq<LJqvx{rbiH5M1ta%3G2Jk!)UDY}fsLGGfJ
z^hU@D49n8e9@fl}g{<|3F3lWF$}-msjIPvHxH)QfL|o3)n>ISHQ~3idP<-19PV8F#
zM9(n-c8oD{mKDJtSOV{`4(pR~@I1^u#@;AEX%o3VUaLE5KM=&3Q_|<>#p70v={3!+
zGR*LXj4<!hg&{*P)DlfeqRr&p^NF6zDutk~BdNkFEUWYyk!dsz_SWIi5V>g=*=w;(
zb5q5tP0EE=vypk08x^g7X*kbl`n-fEFKND@cWQd4-}eMdopV*EAoIuhWkbo&mLq(q
zi4{DJ{KsocmCljs7f^9fmsLi}j#;ORhnb`1*yI^zCTUt;EDP11U+z;KES)*3aS#U2
z))!ry>T~0>-VPB1_n#&w$kwLF^XAx9QviT1cmv>H_&fajPxu3VgJ0pz=biKy_<~H3
zU<;7(4PzUU8%8&btQjLnkR-xE*lewJ5qJyWA9x!ozQYH1hy);#BmmLVM<1gJkO;TJ
F`UhMdw)X%4


From d3ac836657afe8561974fb011e4cecc656414b1a Mon Sep 17 00:00:00 2001
From: MassiveAtoms <s.ramsaransing.w@gmail.com>
Date: Sat, 6 Jul 2019 12:14:18 -0300
Subject: [PATCH 2/3] ammend parkspot to include vehicletype

---
 Park_spot.cpp       |  10 ++++++----
 data.cpp            |   2 +-
 headers/Park_spot.h |   5 +++--
 main.cpp            |  11 ++++-------
 test.db3            | Bin 16384 -> 16384 bytes
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Park_spot.cpp b/Park_spot.cpp
index e64e8e1..7efc6cf 100644
--- a/Park_spot.cpp
+++ b/Park_spot.cpp
@@ -2,14 +2,15 @@
 
 // constructors
 
-Park_spot::Park_spot()
-    : parked_customer{0}, 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(int id_, bool taken_, int parked)
+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?
 {}
 
@@ -48,8 +49,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));
diff --git a/data.cpp b/data.cpp
index be27c0d..5c000b9 100644
--- a/data.cpp
+++ b/data.cpp
@@ -24,7 +24,7 @@ SQLite::Database start_db() {
         // getting errors when using bool, so i used an int instead.
     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)");
diff --git a/headers/Park_spot.h b/headers/Park_spot.h
index e50dfdc..068fc55 100644
--- a/headers/Park_spot.h
+++ b/headers/Park_spot.h
@@ -18,9 +18,10 @@ class Park_spot {
     int id;
     bool taken;
     int parked_customer;
+    Vehicle_type v_type;
     
-    Park_spot();
-    Park_spot(int id_, bool taken_, int parked);
+    Park_spot(Vehicle_type v_type_);
+    Park_spot(int id_, bool taken_, int parked, Vehicle_type v_type_);
     void clock(Customer& c_customer);
 
   private:
diff --git a/main.cpp b/main.cpp
index 7d88f59..dd7794f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -70,12 +70,10 @@ For now, it's just here in case you want an easy way to store customers.
  */
 
 int main() {
+    // state of db:
+    // er zijn 10 parkspots, 5 met biketype en 5 met pickup type
     // er is een customer met id 1(testcustomer) met password "password"
     
-    // Customer test {
-    //     "testcustomer", "password", Vehicle_type::bike
-    // };
-
     interface();
 
 
@@ -89,13 +87,12 @@ 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;");
-    // 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});
+        Vehicle_type vtype = Vehicle_type(int(query.getColumn(3)));
+        spots.push_back({id, taken, cid, vtype});
     }
     return spots;
 }
\ No newline at end of file
diff --git a/test.db3 b/test.db3
index 6e83b13452cc5fa52980122413fb0f25f2951302..fc57d5fe69782b8fce6ed43c9e47b7490999f602 100644
GIT binary patch
delta 272
zcmZo@U~Fh$oFL7}H&Mn}n2$lvM1hxqfq|K?mVv*ApO3G0V<R`;<UYQMoHb1B;_~v0
zjqZ~*_>*LG6v|RFGLv&s<4Y<FQWY}uN;HcY*~MjL85_+fPvKA8{Ehzve_U9YWmbA<
zcA0lzxuIdUzN>$rOHN9<N`-~1v89(^RergDYKWt8N=0FqOOc;RQjVjgOR>LCS$Swq
zqGP0GT6$_E$T3{}TN(I&@_*!i#s7%^HveV*GyF&R_wsMuET}M(-<yq#m4SnSk%g5L
hM02unK)LJ?E*q4~3gNOqxy%qQ6O_vc<}OkY005wTJpup#

delta 151
zcmZo@U~Fh$oFL7}GEv4^n1w;lM1hxqfq|K?kAc6NU!JdTv!H+s-{e}piJVzX?BeqB
zjE%~Z#rc!CG>aM8#bsp~8!abK<xgZR+Wd|G1iw>xR$gF0NoqlazH3f?VL@p?Vwjs@
zpo(LKd!=KTVOU~*lv6;2rK?*?rglYywt-QUOHM{shO47bxp%&!Z<=Xl;35M7AOZj~
CyD9qs


From 3e594b946dbdbabaf7c6535d76272bd213b444ec Mon Sep 17 00:00:00 2001
From: MassiveAtoms <s.ramsaransing.w@gmail.com>
Date: Sat, 6 Jul 2019 13:32:00 -0300
Subject: [PATCH 3/3] added a park interface

---
 Customer.cpp        |  25 ++++++++---
 Interface.cpp       | 103 +++++++++++++++++++++++++++++++++-----------
 Park_time.cpp       |  14 ++++++
 Query.cpp           |  10 +++++
 headers/Customer.h  |   2 +
 headers/Interface.h |   9 ++--
 headers/Park_time.h |   5 +++
 headers/Query.h     |   3 ++
 main.cpp            |  27 +-----------
 test.db3            | Bin 16384 -> 16384 bytes
 10 files changed, 139 insertions(+), 59 deletions(-)

diff --git a/Customer.cpp b/Customer.cpp
index f74c23f..3d7a8a3 100644
--- a/Customer.cpp
+++ b/Customer.cpp
@@ -9,13 +9,12 @@ Customer::Customer(string name_, string password_, Vehicle_type vehicle_)
 
 Customer::Customer(int id_, string name_, string password_,
                    Vehicle_type vehicle_, vector<Park_time> instances)
-    :id{id_},
-     name{name_},
+    : id{id_},
+      name{name_},
       password{password_},
       vehicle{vehicle_},
       park_instances{instances} {}
 
-
 // clock in/out methods
 // ====================================================================================
 /*
@@ -31,6 +30,24 @@ void Customer::clock_out(int s_id) {
     park_instances[park_instances.size() - 1].clock_out(id, s_id);
 }
 
+bool Customer::parked() {
+    if (!park_instances.size()){
+        return false;
+    }
+    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;
+}
+
 // report gen
 void Customer::gen_monthly() {
     cout << "NAME: " << name << "\n";
@@ -83,5 +100,3 @@ int Customer::auto_increment_db() {
     max_id.reset();
     return id;
 }
-
-
diff --git a/Interface.cpp b/Interface.cpp
index 7829c04..f0950b1 100644
--- a/Interface.cpp
+++ b/Interface.cpp
@@ -1,30 +1,9 @@
 #include "headers/Interface.h"
 
-void interface_member() {
-    int id;
-    string password;
-    cout << "\nPlease input id:";
-    cin >> id;
-    Customer c = query_customer_with_id(id);
-    cout << "\nPlease input password:";
-    cin >> password;
-    while (!(verify_password(c.password, password))){
-        cout << "ERROR: wrong password. Please retype your password \n";
-        cin >> password;
-    }
-    cout << "Logged in succesfully\n";
+// 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
 
-    // if (verify_password(c.password, password)) {
-    //     cout << "\nLogged in successfully.";
-    // } else {
-    //     cout
-    //         << "Error, id and password combination not found, please try again.";
-    // }
-}
-
-void interface_admin() {}
-
-void interface() {
+void interface(vector<Park_spot>& spots) {
     int selector;
     cout << "\nHello and welcome to the parking spot! Please select a suitable "
             "option:";
@@ -33,8 +12,80 @@ void interface() {
     cin >> selector;
     switch (selector) {
     case 1:
-        interface_member();
+        interface_member(spots);
     case 2:
-        interface_admin();
+        interface_admin(spots);
     }
 }
+
+void interface_member(vector<Park_spot>& spots) {
+    int id;
+    string password;
+    cout << "\nPlease input id:";
+    cin >> id;
+    Customer c = query_customer_with_id(id);
+    cout << "\nPlease input password:";
+    cin >> password;
+
+    while (!(verify_password(c.password, password))) {
+        cout << "ERROR: wrong password. Please retype your password \n";
+        cin >> password;
+    }
+
+    cout << "Logged in succesfully\n";
+    cout << "select an option\n [1] Parking options\n[2]other";
+    int option;
+    cin >> option;
+    switch (option) {
+    case 1: {
+        park(c, spots);
+    }
+    case 2: {
+        // other thing you want to add
+        break;
+    }
+
+    default:
+        break;
+    }
+}
+
+void interface_admin(vector<Park_spot>& spots) {}
+
+// --------- 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) {
+                cout << i.id << ", ";
+            }
+        }
+
+        cout << "where do you want to park?";
+        int parkid;
+        cin >> parkid;
+        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;
+        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";
+        }
+    }
+}
\ No newline at end of file
diff --git a/Park_time.cpp b/Park_time.cpp
index cd06a55..e6556ec 100644
--- a/Park_time.cpp
+++ b/Park_time.cpp
@@ -112,4 +112,18 @@ int Park_time::auto_increment_db() {
     id = max_id.getColumn(0);
     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});
 }
\ No newline at end of file
diff --git a/Query.cpp b/Query.cpp
index dbe898b..29fb841 100644
--- a/Query.cpp
+++ b/Query.cpp
@@ -75,6 +75,16 @@ Customer query_customer_with_id(int id) {
     }
 }
 
+//------------------------------- 
+
+Park_spot query_parkspot_with_id(int id, vector<Park_spot>& parkspots){
+    for (Park_spot& i : parkspots){
+        if (i.id == id){
+            return i;
+        }
+    }
+}
+
 
 // -------------- paroking spots
 
diff --git a/headers/Customer.h b/headers/Customer.h
index 03ad182..ce02737 100644
--- a/headers/Customer.h
+++ b/headers/Customer.h
@@ -43,6 +43,8 @@ class Customer {
              vector<Park_time> instances);
     void clock_in(int s_id);
     void clock_out(int s_id);
+    bool parked();
+    int parked_at();
 
     void update_db();
     void delete_db();
diff --git a/headers/Interface.h b/headers/Interface.h
index 104ba70..bb59a17 100644
--- a/headers/Interface.h
+++ b/headers/Interface.h
@@ -4,6 +4,9 @@
 
 using std::cin;
 
-void interface();
-void interface_member();
-void interface_admin();
\ No newline at end of file
+
+
+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);
\ No newline at end of file
diff --git a/headers/Park_time.h b/headers/Park_time.h
index 0b5551b..550ad5c 100644
--- a/headers/Park_time.h
+++ b/headers/Park_time.h
@@ -5,6 +5,7 @@
 #include "data.h"
 
 #include <chrono>
+#include <thread>
 #include <ctime>
 #include <iostream>
 #include <string>
@@ -63,4 +64,8 @@ class Park_time {
     int start_to_int();      // helper
 };
 
+
+//test funciton
+void Wait(int sec);
+
 #endif // Park_time
\ No newline at end of file
diff --git a/headers/Query.h b/headers/Query.h
index 6fb8a04..0e93231 100644
--- a/headers/Query.h
+++ b/headers/Query.h
@@ -57,4 +57,7 @@ Customer query_customer_with_id(int id);
 
 vector<Park_spot> populate_spots();
 
+Park_spot query_parkspot_with_id(int id, vector<Park_spot>& parkspots);
+
+
 #endif // CUSTOMER_H
\ No newline at end of file
diff --git a/main.cpp b/main.cpp
index dd7794f..6f95bac 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,9 +1,7 @@
 #include "headers/Interface.h"
 
-#include <thread>
 
 
-using namespace std::chrono;
 
 /*
 Code structure is like this:
@@ -44,37 +42,16 @@ 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. 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});
-}
-
 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;
-/*
-This was meant for an older implementation. park_time objects used to store
-pointers to customers and in order to not get dangling pointers(dangerous!) I
-had to have a way to store the customers the pointer pointed to so they didn't
-get destroyed prematurely(I could've used the lower-level, more dangerous new,
-or worse, malloc, but that's ugly).
-For now, it's just here in case you want an easy way to store customers.
- */
 
 int main() {
     // state of db:
     // er zijn 10 parkspots, 5 met biketype en 5 met pickup type
     // er is een customer met id 1(testcustomer) met password "password"
-    
-    interface();
+
+    interface(parking_spots);
 
 
 }
diff --git a/test.db3 b/test.db3
index fc57d5fe69782b8fce6ed43c9e47b7490999f602..fe4446128ac0fc9bf961cf37242dc13aea361c4b 100644
GIT binary patch
delta 164
zcmZo@U~Fh$oFL68HBrWyQEFqtLU~^PR}5VI^BMT(^MB-DwV6+0BEJ|XBP#=kD5qbj
zj}Ip^oH==`zNrfTPX=~QPEIx^pfCd?3j+g~%L}BL`A;zLzvaKhe`2$s!7hFa0cLgv
qPEHmU##n_j?m!$ZBFF?3VFZdW$10qD0~As=7i2^dnhO+O$^igtP9mNF

delta 82
zcmZo@U~Fh$oFL7}H&Mo!k#A$dLU~>W1_mzvtqlA>`9Jc%+RUdgk$>U@vB_KYO=Vb_
eSs6GOIN6v$6e9~OBbW=)z#y<$&|o`Ip)&wK9}#!}