Merge pull request #73 from SPauly/feat68

Closes #68

Author: SPauly

Data/Inventory.csv

@@ -1,7 +1,7 @@
 BID,NAME,AUTHOR,COPIES,RENTED,LINK
-B123456,FirstBook,AUTHOR Name,0100,0044,Data/Books/FirstBook.txt
+B123456,FirstBook,AUTHOR Name,0100,0001,Data/Books/FirstBook.txt
 B222222,SecondBook,AUTHOR Name,0120,0026,Data/Books/SecondBook.txt
-B333333,ThirdBook,AUTHOR Name,0120,0013,Data/Books/ThirdBook.txt
-B444444,FoursBook,AUTHOR Name,9999,0009,Data/Books/FoursBook.txt
-B555555,FifthBook,AUTHOR Name,0025,0024,Data/Books/FifthBook.txt
-B666666,SixthBook,AUTHOR Name,0025,0025,Data/Books/SixthBook.txt
+B333333,ThirdBook,AUTHOR Name,0120,0014,Data/Books/ThirdBook.txt
+B444444,FoursBook,AUTHOR Name,9999,0010,Data/Books/FoursBook.txt
+B555555,FifthBook,AUTHOR Name,0025,0010,Data/Books/FifthBook.txt
+B666666,SixthBook,AUTHOR Name,0025,0010,Data/Books/SixthBook.txt

LSMS.exe

@@ -76,7 +76,7 @@ namespace LSMS
         return m_is_open = false;
     }
 
-    size_t Book::increase_rented()
+    size_t Book::increase_rented(int incrementor /*= 1*/)
     {
         if (!mptr_parser)
         {
@@ -90,7 +90,7 @@ namespace LSMS
         try
         {
             currently_rented = std::stoi(mptr_row->getvalue("RENTED").data());
-            ++currently_rented;
+            currently_rented += incrementor;
             //Format string to 0001
             for (int val = (currently_rented < 0) ? -currently_rented : currently_rented; format_length >= 0 && val != 0; --format_length, val /= 10)
                 currently_rented_s[format_length] = '0' + val % 10;
@@ -225,7 +225,8 @@ namespace LSMS
         page.clear();
         int line_count = 0;
         m_file.seekg(0, std::ios::beg);
-        while(m_file && line_count < (get_pos()*amount_of_lines)){
+        while (m_file && line_count < (get_pos() * amount_of_lines))
+        {
             fm::_getline(m_file, line);
             ++line_count;
         }
@@ -237,7 +238,8 @@ namespace LSMS
             ++line_count;
         }
 
-        if(line_count < amount_of_lines) {
+        if (line_count < amount_of_lines)
+        {
             page += "END of file\n";
         }
 

src/Book.cpp

@@ -16,7 +16,7 @@ namespace LSMS
         std::fstream m_file;
         bool m_is_open = false;
         std::string page = "";
-        const int amount_of_lines = 30; 
+        const int amount_of_lines = 30;
 
         bool mf_open();
 
@@ -29,7 +29,7 @@ namespace LSMS
 
         bool init(csv::Row *);
 
-        size_t increase_rented();
+        size_t increase_rented(int incrementor = 1);
 
         bool is_available();
         std::string_view get_BID();

src/Book.h

@@ -40,7 +40,7 @@ namespace LSMS
                 log("\n---------------------------- MENU -----------------------------\n");
                 log(" [1] Rent a book                   [2] Read a book (beta)\n");
                 log(" [3] Show my books                 [4] List books\n");
-                log(" [5] Buy a book                    [6] Return a book (unavailable)\n");
+                log(" [5] Buy a book                    [6] Return a book\n");
                 log(" [7] Log out                       [8] Exit\n");
                 log("\nWhat do you want to do? (1-8)>>");
 
@@ -106,6 +106,12 @@ namespace LSMS
                         log("Bought " + bookname);
                         bookname.clear();
                         break;
+                    case '6':
+                        log("Enter Book you want to return: ");
+                        std::getline(std::cin, bookname);
+                        mf_return_book(bookname);
+                        bookname.clear();
+                        break;
                     case '7':
                         log("Logging out\n");
                         m_user.logout();
@@ -214,7 +220,7 @@ namespace LSMS
                     break;
                 }
             } while (tmp == "" && m_user.change_position_in_book(BOOK_PTR()->get_pos() + 1, _bookname));
-            
+
             return true;
         }
         catch (csv::Error &e)
@@ -224,4 +230,24 @@ namespace LSMS
         }
     }
 
+    void Library::mf_return_book(std::string_view _bookname)
+    {
+        try
+        {
+            if (m_user.remove_book(_bookname))
+            { //remove book initializes BOOK_PTR()
+                if (BOOK_PTR()->increase_rented(-1))
+                    log("Returned book successfully\n");
+                else
+                    log("Failed to return to inventory\n");
+            }
+            else
+                log("Failed to remove from Account\n");
+        }
+        catch (csv::Error &e)
+        {
+            log("Could not find the book in your inventory.\n");
+        }
+    }
+
 }

src/Library.cpp

@@ -28,6 +28,7 @@ namespace LSMS
         std::string &mf_get_my_books(std::string &);
         std::string &mf_list_books(std::string &);
         bool mf_read_book(std::string_view);
+        void mf_return_book(std::string_view);
 
     public:
         Library();

src/Library.h

@@ -727,10 +727,10 @@ namespace LSMS
                 {
                     tmp.clear();
                     last_pos = m_userinfo_txt.tellg();
-                    while (finder != '\n' )
+                    while (finder != '\n')
                     {
                         m_userinfo_txt.get(finder);
-                        if(finder == ',')
+                        if (finder == ',')
                             break;
                         tmp += finder;
                     }
@@ -746,6 +746,64 @@ namespace LSMS
             }
             return _pos;
         }
+
+        bool User::remove_book(std::string_view _bookname)
+        {
+            bool flag = false;
+            int pos_in_vector = 0;
+
+            for (; pos_in_vector < mvec_books.size(); pos_in_vector++)
+            {
+                BOOK_PTR()->init(&mvec_books.at(pos_in_vector));
+                if (BOOK_PTR()->get_NAME() == _bookname)
+                {
+                    mvec_books.erase(mvec_books.begin() + pos_in_vector);
+                    flag = true;
+                    break;
+                }
+            }
+
+            if (!flag)
+                return false;
+
+            if (m_userinfo_txt.good() && m_userinfo_txt.is_open())
+            {
+                size_t last_pos = m_dimensions.beg;
+                std::string tmp;
+                char finder = 0;
+
+                m_userinfo_txt.seekg(m_dimensions.beg);
+                std::getline(m_userinfo_txt, tmp); //skip initial line
+                std::getline(m_userinfo_txt, tmp); //skip Name: line
+                while (tmp != BOOK_PTR()->get_BID())
+                {
+                    tmp.clear();
+                    last_pos = m_userinfo_txt.tellg();
+                    while (finder != '\n')
+                    {
+                        m_userinfo_txt.get(finder);
+                        if (finder == ',')
+                            break;
+                        tmp += finder;
+                    }
+                    finder = 0;
+                }
+                m_userinfo_txt.seekp(last_pos);
+
+                for (pos_in_vector; pos_in_vector < mvec_books.size(); pos_in_vector++)
+                {
+                    m_userinfo_txt << mvec_books.at(pos_in_vector).string();
+                }
+                m_userinfo_txt << "---------------------\r\n";
+                m_userinfo_txt.flush();
+            }
+            else
+            {
+                return 0;
+            }
+
+            return true;
+        }
     } //end user
 
 } //end user

src/User.cpp

@@ -151,8 +151,9 @@ namespace LSMS
             std::string get_published();
             bool can_rent();
             bool can_buy();
-            csv::Row* has_book(std::string_view);
+            csv::Row *has_book(std::string_view);
             size_t change_position_in_book(size_t, std::string_view);
+            bool remove_book(std::string_view);
         };
 
     }