martin/kima2
1
1
Fork 0
Code Issues Pull requests Releases 23 Wiki Activity

sellers: get rid of uuid

Browse source
This commit is contained in:
Martin Brodbeck 2019-10-04 15:15:43 +02:00
parent 46d6468e5c
commit 69982fc931
16 changed files with 76 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -30,11 +30,11 @@ endif()
add_subdirectory(3rdparty) add_subdirectory(3rdparty)
add_subdirectory(src) add_subdirectory(src)
if(NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE MATCHES Debug) #if(NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE MATCHES Debug)
include(CTest) # include(CTest)
enable_testing() # enable_testing()
add_subdirectory(test) # add_subdirectory(test)
endif() #endif()
# CPack # CPack

1
src/core/CMakeLists.txt
View file

@ -13,6 +13,7 @@ endif (MINGW)
set(CORE_SOURCES set(CORE_SOURCES
database.cpp database.cpp
entity.cpp entity.cpp
entityint.cpp
entityuuid.cpp entityuuid.cpp
seller.cpp seller.cpp
article.cpp article.cpp

4
src/core/csvreader.cpp
View file

@ -40,7 +40,6 @@ std::size_t CsvReader::readSellersFromFile(const fs::path& filePath, Marketplace
} }
auto seller = std::make_unique<Seller>(); auto seller = std::make_unique<Seller>();
seller->createUuid();
seller->setSellerNo(row[0].get<int>()); seller->setSellerNo(row[0].get<int>());
if (row[1].is_int()) { if (row[1].is_int()) {
seller->setNumArticlesOffered(row[1].get<int>()); seller->setNumArticlesOffered(row[1].get<int>());
@ -56,10 +55,9 @@ std::size_t CsvReader::readSellersFromFile(const fs::path& filePath, Marketplace
} }
// If there was no special seller "Sonderkonto" in import data, then create one // If there was no special seller "Sonderkonto" in import data, then create one
auto specialSeller = market->findSellerWithUuid("11111111-1111-1111-1111-111111111111"); auto specialSeller = market->findSellerWithSellerNo(0);
if (!specialSeller) { if (!specialSeller) {
auto seller = std::make_unique<Seller>(); auto seller = std::make_unique<Seller>();
seller->setUuidFromString("11111111-1111-1111-1111-111111111111");
seller->setSellerNo(0); seller->setSellerNo(0);
seller->setLastName("Sonderkonto"); seller->setLastName("Sonderkonto");
seller->setFirstName("Sonderkonto"); seller->setFirstName("Sonderkonto");

83
src/core/database.cpp
View file

@ -75,11 +75,10 @@ void Database::createNew()
std::string sqlCreateKima2{"CREATE TABLE IF NOT EXISTS kima2 (" std::string sqlCreateKima2{"CREATE TABLE IF NOT EXISTS kima2 ("
"version INTEGER NOT NULL);" "version INTEGER NOT NULL);"
"INSERT INTO kima2 (version) VALUES (2);"}; "INSERT INTO kima2 (version) VALUES (3);"};
sqlStrings.push_back(sqlCreateKima2); sqlStrings.push_back(sqlCreateKima2);
std::string sqlCreateSellers{"CREATE TABLE IF NOT EXISTS sellers (" std::string sqlCreateSellers{"CREATE TABLE IF NOT EXISTS sellers ("
"id TEXT PRIMARY KEY NOT NULL, " "seller_no INTEGER PRIMARY KEY NOT NULL, "
"seller_no INTEGER, "
"first_name TEXT, " "first_name TEXT, "
"last_name TEXT, " "last_name TEXT, "
"num_offered_articles INTEGER, " "num_offered_articles INTEGER, "
@ -89,13 +88,13 @@ void Database::createNew()
std::string sqlCreateArticles{ std::string sqlCreateArticles{
"CREATE TABLE IF NOT EXISTS articles (" "CREATE TABLE IF NOT EXISTS articles ("
"id TEXT PRIMARY KEY NOT NULL, " "id TEXT PRIMARY KEY NOT NULL, "
"seller_id TEXT NOT NULL, " "seller_no TEXT NOT NULL, "
"source_no INTEGER NOT NULL, " "source_no INTEGER NOT NULL, "
"article_no INTEGER NOT NULL, " "article_no INTEGER NOT NULL, "
"description TEXT, " "description TEXT, "
"price INTEGER NOT NULL, " "price INTEGER NOT NULL, "
"UNIQUE (source_no, article_no), " "UNIQUE (source_no, article_no), "
"FOREIGN KEY (seller_id) REFERENCES sellers(id) ON DELETE CASCADE, " "FOREIGN KEY (seller_no) REFERENCES sellers(seller_no) ON DELETE CASCADE, "
"CHECK (article_no BETWEEN 0 AND 99999)" "CHECK (article_no BETWEEN 0 AND 99999)"
");"}; ");"};
sqlStrings.push_back(sqlCreateArticles); sqlStrings.push_back(sqlCreateArticles);
@ -115,9 +114,9 @@ void Database::createNew()
sqlStrings.push_back(sqlCreateSalesItems); sqlStrings.push_back(sqlCreateSalesItems);
std::string sqlInitialEntries{ std::string sqlInitialEntries{
"INSERT OR IGNORE INTO sellers (id, seller_no, first_name, last_name, " "INSERT OR IGNORE INTO sellers (seller_no, first_name, last_name, "
"num_offered_articles) VALUES " "num_offered_articles) VALUES "
"('11111111-1111-1111-1111-111111111111', 0, 'Sonderkonto', 'Sonderkonto', 0)"}; "(0, 'Sonderkonto', 'Sonderkonto', 0)"};
sqlStrings.push_back(sqlInitialEntries); sqlStrings.push_back(sqlInitialEntries);
beginTransaction(); beginTransaction();
@ -130,13 +129,18 @@ void Database::createNew()
void Database::updateDbToVer2() void Database::updateDbToVer2()
{ {
beginTransaction(); beginTransaction();
exec("INSERT OR IGNORE INTO sellers (id, seller_no, first_name, last_name, " exec("INSERT OR IGNORE INTO sellers (seller_no, first_name, last_name, "
"num_offered_articles) VALUES " "num_offered_articles) VALUES "
"('11111111-1111-1111-1111-111111111111', 0, 'Sonderkonto', 'Sonderkonto', 0)"); "(0, 'Sonderkonto', 'Sonderkonto', 0)");
exec("UPDATE kima2 SET version = 2"); exec("UPDATE kima2 SET version = 3");
endTransaction(); endTransaction();
} }
void Database::updateDbToVer3()
{
newDb();
}
void Database::init() void Database::init()
{ {
const int errCode = sqlite3_open(dbname_.c_str(), &db_); const int errCode = sqlite3_open(dbname_.c_str(), &db_);
@ -154,7 +158,10 @@ void Database::init()
createNew(); createNew();
break; break;
case 1: case 1:
updateDbToVer2(); updateDbToVer3();
break;
case 2:
updateDbToVer3();
break; break;
default: default:
// Do nothing because we are up-to-date. // Do nothing because we are up-to-date.
@ -225,16 +232,13 @@ unsigned int Database::storeSellers(std::vector<std::unique_ptr<Seller>>& seller
retCode = sqlite3_prepare_v2( retCode = sqlite3_prepare_v2(
db_, db_,
"INSERT INTO sellers" "INSERT INTO sellers"
" (id, seller_no, first_name, last_name, num_offered_articles)" " (seller_no, first_name, last_name, num_offered_articles)"
" VALUES (:uuid, :seller_no, :first_name, :last_name, :num_offered_articles)", " VALUES (:seller_no, :first_name, :last_name, :num_offered_articles)",
-1, &stmt, nullptr); -1, &stmt, nullptr);
if (retCode != SQLITE_OK) if (retCode != SQLITE_OK)
throw std::runtime_error(sqlite3_errmsg(db_)); throw std::runtime_error(sqlite3_errmsg(db_));
sqlite3_bind_text(stmt, sqlite3_bind_parameter_index(stmt, ":uuid"),
boost::uuids::to_string(seller->getUuid()).c_str(), -1,
SQLITE_TRANSIENT);
sqlite3_bind_int(stmt, sqlite3_bind_parameter_index(stmt, ":seller_no"), sqlite3_bind_int(stmt, sqlite3_bind_parameter_index(stmt, ":seller_no"),
seller->getSellerNo()); seller->getSellerNo());
sqlite3_bind_text(stmt, sqlite3_bind_parameter_index(stmt, ":first_name"), sqlite3_bind_text(stmt, sqlite3_bind_parameter_index(stmt, ":first_name"),
@ -260,15 +264,14 @@ unsigned int Database::storeSellers(std::vector<std::unique_ptr<Seller>>& seller
"UPDATE sellers SET" "UPDATE sellers SET"
" seller_no = :seller_no, first_name = :first_name," " seller_no = :seller_no, first_name = :first_name,"
" last_name = :last_name, num_offered_articles = :num_offered_articles" " last_name = :last_name, num_offered_articles = :num_offered_articles"
" WHERE id = :uuid", " WHERE seller_no = :id",
-1, &stmt, nullptr); -1, &stmt, nullptr);
if (retCode != SQLITE_OK) if (retCode != SQLITE_OK)
throw std::runtime_error(sqlite3_errmsg(db_)); throw std::runtime_error(sqlite3_errmsg(db_));
sqlite3_bind_text(stmt, sqlite3_bind_parameter_index(stmt, ":uuid"), sqlite3_bind_int(stmt, sqlite3_bind_parameter_index(stmt, ":id"),
boost::uuids::to_string(seller->getUuid()).c_str(), -1, seller->getId());
SQLITE_TRANSIENT);
sqlite3_bind_int(stmt, sqlite3_bind_parameter_index(stmt, ":seller_no"), sqlite3_bind_int(stmt, sqlite3_bind_parameter_index(stmt, ":seller_no"),
seller->getSellerNo()); seller->getSellerNo());
sqlite3_bind_text(stmt, sqlite3_bind_parameter_index(stmt, ":first_name"), sqlite3_bind_text(stmt, sqlite3_bind_parameter_index(stmt, ":first_name"),
@ -292,14 +295,13 @@ unsigned int Database::storeSellers(std::vector<std::unique_ptr<Seller>>& seller
count += static_cast<int>(seller->getArticles(false).size()); count += static_cast<int>(seller->getArticles(false).size());
retCode = retCode =
sqlite3_prepare_v2(db_, "DELETE FROM sellers WHERE id = :uuid", -1, &stmt, nullptr); sqlite3_prepare_v2(db_, "DELETE FROM sellers WHERE seller_no = :id", -1, &stmt, nullptr);
if (retCode != SQLITE_OK) if (retCode != SQLITE_OK)
throw std::runtime_error(sqlite3_errmsg(db_)); throw std::runtime_error(sqlite3_errmsg(db_));
sqlite3_bind_text(stmt, sqlite3_bind_parameter_index(stmt, ":uuid"), sqlite3_bind_int(stmt, sqlite3_bind_parameter_index(stmt, ":id"),
boost::uuids::to_string(seller->getUuid()).c_str(), -1, seller->getId());
SQLITE_TRANSIENT);
retCode = sqlite3_step(stmt); retCode = sqlite3_step(stmt);
@ -346,7 +348,7 @@ unsigned int Database::storeArticles(std::vector<Article*> articles)
retCode = sqlite3_prepare_v2( retCode = sqlite3_prepare_v2(
db_, db_,
"INSERT INTO articles" "INSERT INTO articles"
" (id, seller_id, source_no, article_no, description, price)" " (id, seller_no, source_no, article_no, description, price)"
" VALUES (:uuid, :seller_id, :source_no, :article_no, :desc, :price)", " VALUES (:uuid, :seller_id, :source_no, :article_no, :desc, :price)",
-1, &stmt, nullptr); -1, &stmt, nullptr);
@ -356,9 +358,8 @@ unsigned int Database::storeArticles(std::vector<Article*> articles)
sqlite3_bind_text(stmt, sqlite3_bind_parameter_index(stmt, ":uuid"), sqlite3_bind_text(stmt, sqlite3_bind_parameter_index(stmt, ":uuid"),
boost::uuids::to_string(article->getUuid()).c_str(), -1, boost::uuids::to_string(article->getUuid()).c_str(), -1,
SQLITE_TRANSIENT); SQLITE_TRANSIENT);
sqlite3_bind_text(stmt, sqlite3_bind_parameter_index(stmt, ":seller_id"), sqlite3_bind_int(stmt, sqlite3_bind_parameter_index(stmt, ":seller_id"),
boost::uuids::to_string(article->getSeller()->getUuid()).c_str(), -1, article->getSeller()->getId());
SQLITE_TRANSIENT);
sqlite3_bind_int(stmt, sqlite3_bind_parameter_index(stmt, ":source_no"), sqlite3_bind_int(stmt, sqlite3_bind_parameter_index(stmt, ":source_no"),
article->getSourceNo()); article->getSourceNo());
sqlite3_bind_int(stmt, sqlite3_bind_parameter_index(stmt, ":article_no"), sqlite3_bind_int(stmt, sqlite3_bind_parameter_index(stmt, ":article_no"),
@ -382,7 +383,7 @@ unsigned int Database::storeArticles(std::vector<Article*> articles)
retCode = sqlite3_prepare_v2( retCode = sqlite3_prepare_v2(
db_, db_,
"UPDATE articles SET" "UPDATE articles SET"
" seller_id = seller_id, source_no = :source_no, article_no = :article_no," " seller_no = :seller_id, source_no = :source_no, article_no = :article_no,"
" description = :desc, price = :price" " description = :desc, price = :price"
" WHERE id = :uuid", " WHERE id = :uuid",
-1, &stmt, nullptr); -1, &stmt, nullptr);
@ -393,9 +394,8 @@ unsigned int Database::storeArticles(std::vector<Article*> articles)
sqlite3_bind_text(stmt, sqlite3_bind_parameter_index(stmt, ":uuid"), sqlite3_bind_text(stmt, sqlite3_bind_parameter_index(stmt, ":uuid"),
boost::uuids::to_string(article->getUuid()).c_str(), -1, boost::uuids::to_string(article->getUuid()).c_str(), -1,
SQLITE_TRANSIENT); SQLITE_TRANSIENT);
sqlite3_bind_text(stmt, sqlite3_bind_parameter_index(stmt, ":seller_id"), sqlite3_bind_int(stmt, sqlite3_bind_parameter_index(stmt, ":seller_id"),
boost::uuids::to_string(article->getSeller()->getUuid()).c_str(), -1, article->getSeller()->getId());
SQLITE_TRANSIENT);
sqlite3_bind_int(stmt, sqlite3_bind_parameter_index(stmt, ":source_no"), sqlite3_bind_int(stmt, sqlite3_bind_parameter_index(stmt, ":source_no"),
article->getSourceNo()); article->getSourceNo());
sqlite3_bind_int(stmt, sqlite3_bind_parameter_index(stmt, ":article_no"), sqlite3_bind_int(stmt, sqlite3_bind_parameter_index(stmt, ":article_no"),
@ -553,7 +553,7 @@ unsigned int Database::loadSellers(std::vector<std::unique_ptr<Seller>>& sellers
sqlite3_stmt* stmt; sqlite3_stmt* stmt;
retCode = sqlite3_prepare_v2(db_, retCode = sqlite3_prepare_v2(db_,
"SELECT id, seller_no, first_name, last_name, " "SELECT seller_no, first_name, last_name, "
"num_offered_articles FROM sellers ORDER BY seller_no", "num_offered_articles FROM sellers ORDER BY seller_no",
-1, &stmt, nullptr); -1, &stmt, nullptr);
if (retCode != SQLITE_OK) if (retCode != SQLITE_OK)
@ -566,11 +566,10 @@ unsigned int Database::loadSellers(std::vector<std::unique_ptr<Seller>>& sellers
while (retCode != SQLITE_DONE) { while (retCode != SQLITE_DONE) {
++count; ++count;
auto seller = std::make_unique<Seller>(); auto seller = std::make_unique<Seller>();
seller->setUuidFromString(reinterpret_cast<const char*>(sqlite3_column_text(stmt, 0))); seller->setSellerNo(sqlite3_column_int(stmt, 0));
seller->setSellerNo(sqlite3_column_int(stmt, 1)); seller->setFirstName(reinterpret_cast<const char*>(sqlite3_column_text(stmt, 1)));
seller->setFirstName(reinterpret_cast<const char*>(sqlite3_column_text(stmt, 2))); seller->setLastName(reinterpret_cast<const char*>(sqlite3_column_text(stmt, 2)));
seller->setLastName(reinterpret_cast<const char*>(sqlite3_column_text(stmt, 3))); seller->setNumArticlesOffered(sqlite3_column_int(stmt, 3));
seller->setNumArticlesOffered(sqlite3_column_int(stmt, 4));
seller->setState(Seller::State::OK); seller->setState(Seller::State::OK);
sellers.push_back(std::move(seller)); sellers.push_back(std::move(seller));
@ -583,14 +582,14 @@ unsigned int Database::loadSellers(std::vector<std::unique_ptr<Seller>>& sellers
retCode = sqlite3_prepare_v2(db_, retCode = sqlite3_prepare_v2(db_,
"SELECT id, source_no, article_no, description, price" "SELECT id, source_no, article_no, description, price"
" FROM articles" " FROM articles"
" WHERE seller_id = :seller_uuid" " WHERE seller_no = :seller_id"
" ORDER BY article_no", " ORDER BY article_no",
-1, &stmt, nullptr); -1, &stmt, nullptr);
if (retCode != SQLITE_OK) if (retCode != SQLITE_OK)
throw std::runtime_error(sqlite3_errmsg(db_)); throw std::runtime_error(sqlite3_errmsg(db_));
sqlite3_bind_text(stmt, sqlite3_bind_parameter_index(stmt, ":seller_uuid"), sqlite3_bind_int(stmt, sqlite3_bind_parameter_index(stmt, ":seller_id"),
boost::uuids::to_string(seller->getUuid()).c_str(), -1, SQLITE_TRANSIENT); seller->getId());
retCode = sqlite3_step(stmt); retCode = sqlite3_step(stmt);
@ -746,4 +745,4 @@ void Database::updateCashPointNo(int oldCashPointNo, int newCashPointNo)
sqlite3_finalize(stmt); sqlite3_finalize(stmt);
endTransaction(); endTransaction();
} }

3
src/core/database.h
View file

@ -36,6 +36,7 @@ class Database
int getVersion(); int getVersion();
unsigned int storeArticles(std::vector<Article*> articles); unsigned int storeArticles(std::vector<Article*> articles);
void updateDbToVer2(); void updateDbToVer2();
void updateDbToVer3();
}; };
#endif // DATABASE_H #endif // DATABASE_H

4
src/core/entityuuid.cpp
View file

@ -19,10 +19,6 @@ void EntityUuid::setUuidFromString(const std::string& uuidString)
uuid_ = generator(uuidString); uuid_ = generator(uuidString);
} }
Entity::State EntityUuid::getState() const
{
return state_;
}
void EntityUuid::setSourceNo(int sourceNo) { void EntityUuid::setSourceNo(int sourceNo) {
sourceNo_ = sourceNo; sourceNo_ = sourceNo;

3
src/core/entityuuid.h
View file

@ -16,12 +16,10 @@ class EntityUuid : public Entity
void createUuid(); void createUuid();
void setUuidFromString(const std::string& uuidString); void setUuidFromString(const std::string& uuidString);
void setState(State state) { state_ = state; }
void setSourceNo(int sourceNo); void setSourceNo(int sourceNo);
const boost::uuids::uuid& getUuid() const { return uuid_; }; const boost::uuids::uuid& getUuid() const { return uuid_; };
std::string getUuidAsString() const { return boost::uuids::to_string(uuid_); } std::string getUuidAsString() const { return boost::uuids::to_string(uuid_); }
virtual State getState() const;
virtual int getSourceNo() const; virtual int getSourceNo() const;
protected: protected:
@ -29,7 +27,6 @@ class EntityUuid : public Entity
private: private:
boost::uuids::uuid uuid_{}; boost::uuids::uuid uuid_{};
State state_{State::NEW};
}; };
#endif // ENTITY_UUID_H #endif // ENTITY_UUID_H

4
src/core/excelreader.cpp
View file

@ -39,7 +39,6 @@ std::size_t ExcelReader::readSellersFromFile(const fs::path& filePath, Marketpla
continue; continue;
} }
auto seller = std::make_unique<Seller>(); auto seller = std::make_unique<Seller>();
seller->createUuid();
seller->setSellerNo(row[0].value<int>()); seller->setSellerNo(row[0].value<int>());
seller->setNumArticlesOffered(row[1].value<int>()); seller->setNumArticlesOffered(row[1].value<int>());
std::string firstName = row[2].value<std::string>(); std::string firstName = row[2].value<std::string>();
@ -51,10 +50,9 @@ std::size_t ExcelReader::readSellersFromFile(const fs::path& filePath, Marketpla
} }
// If there was no special seller "Sonderkonto" in import data, then create one // If there was no special seller "Sonderkonto" in import data, then create one
auto specialSeller = market->findSellerWithUuid("11111111-1111-1111-1111-111111111111"); auto specialSeller = market->findSellerWithSellerNo(0);
if (!specialSeller) { if (!specialSeller) {
auto seller = std::make_unique<Seller>(); auto seller = std::make_unique<Seller>();
seller->setUuidFromString("11111111-1111-1111-1111-111111111111");
seller->setSellerNo(0); seller->setSellerNo(0);
seller->setLastName("Sonderkonto"); seller->setLastName("Sonderkonto");
seller->setFirstName("Sonderkonto"); seller->setFirstName("Sonderkonto");

11
src/core/jsonutil.cpp
View file

@ -15,7 +15,6 @@ void JsonUtil::exportSellers(const std::filesystem::path& filePath, Marketplace*
for (const auto& seller : market->getSellers()) { for (const auto& seller : market->getSellers()) {
json newEntry; json newEntry;
newEntry["uuid"] = seller->getUuidAsString();
newEntry["seller_no"] = seller->getSellerNo(); newEntry["seller_no"] = seller->getSellerNo();
newEntry["last_name"] = seller->getLastName(); newEntry["last_name"] = seller->getLastName();
newEntry["first_name"] = seller->getFirstName(); newEntry["first_name"] = seller->getFirstName();
@ -38,7 +37,6 @@ void JsonUtil::importSellers(const std::filesystem::path& filePath, Marketplace*
for (auto val : jsonValues["sellers"]) { for (auto val : jsonValues["sellers"]) {
auto seller = std::make_unique<Seller>(); auto seller = std::make_unique<Seller>();
seller->setUuidFromString(val["uuid"]);
seller->setSellerNo(val["seller_no"]); seller->setSellerNo(val["seller_no"]);
seller->setLastName(val["last_name"]); seller->setLastName(val["last_name"]);
seller->setFirstName(val["first_name"]); seller->setFirstName(val["first_name"]);
@ -47,10 +45,9 @@ void JsonUtil::importSellers(const std::filesystem::path& filePath, Marketplace*
} }
// If there was no special seller "Sonderkonto" in import data, then create one // If there was no special seller "Sonderkonto" in import data, then create one
auto specialSeller = market->findSellerWithUuid("11111111-1111-1111-1111-111111111111"); auto specialSeller = market->findSellerWithSellerNo(0);
if (!specialSeller) { if (!specialSeller) {
auto seller = std::make_unique<Seller>(); auto seller = std::make_unique<Seller>();
seller->setUuidFromString("11111111-1111-1111-1111-111111111111");
seller->setSellerNo(0); seller->setSellerNo(0);
seller->setLastName("Sonderkonto"); seller->setLastName("Sonderkonto");
seller->setFirstName("Sonderkonto"); seller->setFirstName("Sonderkonto");
@ -81,7 +78,7 @@ void JsonUtil::exportSales(const std::filesystem::path& filePath, Marketplace* m
for (const auto& article : sale->getArticles()) { for (const auto& article : sale->getArticles()) {
json newArticle; json newArticle;
newArticle["uuid"] = article->getUuidAsString(); newArticle["uuid"] = article->getUuidAsString();
newArticle["seller_uuid"] = article->getSeller()->getUuidAsString(); newArticle["seller_no"] = article->getSeller()->getSellerNo();
newArticle["desc"] = article->getDescription(); newArticle["desc"] = article->getDescription();
newArticle["price"] = article->getPrice(); newArticle["price"] = article->getPrice();
// newArticle["source_no"] = article->getSourceNo(); // newArticle["source_no"] = article->getSourceNo();
@ -122,7 +119,7 @@ void JsonUtil::importSales(const std::filesystem::path& filePath, Marketplace* m
article->setArticleNo(valArticle["article_no"]); article->setArticleNo(valArticle["article_no"]);
article->setDescription(valArticle["desc"]); article->setDescription(valArticle["desc"]);
article->setPrice(valArticle["price"]); article->setPrice(valArticle["price"]);
auto seller = market->findSellerWithUuid(valArticle["seller_uuid"]); auto seller = market->findSellerWithSellerNo(valArticle["seller_no"]);
if (seller == nullptr) { if (seller == nullptr) {
throw std::runtime_error( throw std::runtime_error(
"Die zu importierenden Daten verweisen auf einen nicht vorhandenen Verkäufer. " "Die zu importierenden Daten verweisen auf einen nicht vorhandenen Verkäufer. "
@ -136,4 +133,4 @@ void JsonUtil::importSales(const std::filesystem::path& filePath, Marketplace* m
} }
market->storeToDb(); market->storeToDb();
} }

8
src/core/marketplace.cpp
View file

@ -13,9 +13,9 @@ namespace fs = std::filesystem;
Marketplace::Marketplace() Marketplace::Marketplace()
{ {
auto seller = std::make_unique<Seller>("Max", "Mustermann"); /*auto seller = std::make_unique<Seller>("Max", "Mustermann");
seller->createUuid(); seller->createUuid();
sellers_.push_back(std::move(seller)); sellers_.push_back(std::move(seller)); */
} }
void Marketplace::storeToDb(bool onlyDelete) void Marketplace::storeToDb(bool onlyDelete)
@ -103,6 +103,7 @@ Seller* Marketplace::findSellerWithSellerNo(int sellerNo)
return (*iter).get(); return (*iter).get();
} }
/*
Seller* Marketplace::findSellerWithUuid(const std::string& uuid) Seller* Marketplace::findSellerWithUuid(const std::string& uuid)
{ {
auto iter = std::find_if(sellers_.begin(), sellers_.end(), auto iter = std::find_if(sellers_.begin(), sellers_.end(),
@ -111,6 +112,7 @@ Seller* Marketplace::findSellerWithUuid(const std::string& uuid)
return nullptr; return nullptr;
return (*iter).get(); return (*iter).get();
} }
*/
void Marketplace::addArticleToBasket(std::unique_ptr<Article> article) void Marketplace::addArticleToBasket(std::unique_ptr<Article> article)
{ {
@ -289,4 +291,4 @@ void Marketplace::clear()
Database db; Database db;
db.newDb(); db.newDb();
loadFromDb(); loadFromDb();
} }

4
src/core/seller.cpp
View file

@ -7,7 +7,7 @@
Seller::Seller(const std::string& firstName, const std::string& lastName, int sellerNo, Seller::Seller(const std::string& firstName, const std::string& lastName, int sellerNo,
int numArticlesOffered) int numArticlesOffered)
: EntityUuid() : EntityInt()
{ {
firstName_ = firstName; firstName_ = firstName;
lastName_ = lastName; lastName_ = lastName;
@ -15,7 +15,7 @@ Seller::Seller(const std::string& firstName, const std::string& lastName, int se
numArticlesOffered_ = numArticlesOffered; numArticlesOffered_ = numArticlesOffered;
} }
void Seller::setSellerNo(int seller_no) { sellerNo_ = seller_no; } void Seller::setSellerNo(int seller_no) { sellerNo_ = seller_no; id_ = seller_no;}
void Seller::setFirstName(const std::string& firstName) { firstName_ = firstName; } void Seller::setFirstName(const std::string& firstName) { firstName_ = firstName; }

4
src/core/seller.h
View file

@ -2,7 +2,7 @@
#define SELLER_H #define SELLER_H
#include "article.h" #include "article.h"
#include "entityuuid.h" #include "entityint.h"
#include <memory> #include <memory>
#include <string> #include <string>
@ -10,7 +10,7 @@
// class Article; // class Article;
class Seller : public EntityUuid class Seller : public EntityInt
{ {
public: public:
Seller() = default; Seller() = default;

4
src/gui/reportdialog.cpp
View file

@ -102,7 +102,7 @@ void ReportDialog::onPrintReportButtonClicked()
for (unsigned int j = 0; for (unsigned int j = 0;
j < ENTRIES_PER_PAGE && (i - 1) * ENTRIES_PER_PAGE + j < sellers.size(); ++j) { j < ENTRIES_PER_PAGE && (i - 1) * ENTRIES_PER_PAGE + j < sellers.size(); ++j) {
int idx = (i - 1) * ENTRIES_PER_PAGE + j; int idx = (i - 1) * ENTRIES_PER_PAGE + j;
if (sellers.at(idx)->getUuidAsString() == "11111111-1111-1111-1111-111111111111") { if (sellers.at(idx)->getId() == 0) {
continue; continue;
} }
content += QString("%1 %2 %3 %4 %5 %6 %7\n") content += QString("%1 %2 %3 %4 %5 %6 %7\n")
@ -121,7 +121,7 @@ void ReportDialog::onPrintReportButtonClicked()
} }
// pieces booked on the special account "Sonderkonto" // pieces booked on the special account "Sonderkonto"
const auto specialSeller = market_->findSellerWithUuid("11111111-1111-1111-1111-111111111111"); const auto specialSeller = market_->findSellerWithSellerNo(0);
if (specialSeller && specialSeller->numArticlesSold() > 0) { if (specialSeller && specialSeller->numArticlesSold() > 0) {
printer.newPage(); printer.newPage();
painter.setFont(QFont("Arial", 16, QFont::Bold)); painter.setFont(QFont("Arial", 16, QFont::Bold));

4
src/gui/reportmodel.cpp
View file

@ -59,7 +59,7 @@ QVariant ReportModel::data(const QModelIndex& index, int role) const
switch (index.column()) { switch (index.column()) {
case 0: case 0:
return seller->getUuidAsString().c_str(); return seller->getId();
case 1: case 1:
return seller->getSellerNo(); return seller->getSellerNo();
case 2: case 2:
@ -104,4 +104,4 @@ QVariant ReportModel::headerData(int section, Qt::Orientation orientation, int r
// return QStringLiteral("%1").arg(section); // return QStringLiteral("%1").arg(section);
} else } else
return ""; return "";
} }

9
src/gui/sellermodel.cpp
View file

@ -31,7 +31,7 @@ QVariant SellerModel::data(const QModelIndex& index, int role) const
*/ */
switch (index.column()) { switch (index.column()) {
case 0: case 0:
return seller->getUuidAsString().c_str(); return seller->getId();
case 1: case 1:
return seller->getSellerNo(); return seller->getSellerNo();
case 2: case 2:
@ -85,7 +85,7 @@ bool SellerModel::setData(const QModelIndex& index, const QVariant& value, int r
switch (index.column()) { switch (index.column()) {
case 0: case 0:
seller->setUuidFromString(value.toString().toStdString()); seller->setId(value.toInt());
break; break;
case 1: { case 1: {
if (value.toInt() < 0) if (value.toInt() < 0)
@ -126,7 +126,6 @@ bool SellerModel::insertRows(int row, int count, const QModelIndex& parent)
{ {
emit beginInsertRows(parent, row, row + count - 1); emit beginInsertRows(parent, row, row + count - 1);
auto seller = std::make_unique<Seller>(); auto seller = std::make_unique<Seller>();
seller->createUuid();
seller->setSellerNo(marketplace_->getNextSellerNo()); seller->setSellerNo(marketplace_->getNextSellerNo());
marketplace_->getSellers().push_back(std::move(seller)); marketplace_->getSellers().push_back(std::move(seller));
emit endInsertRows(); emit endInsertRows();
@ -142,7 +141,7 @@ bool SellerModel::removeRows(int row, int count, const QModelIndex& parent)
marketplace_->getSellers().erase( marketplace_->getSellers().erase(
std::remove_if(marketplace_->getSellers().begin(), marketplace_->getSellers().end(), std::remove_if(marketplace_->getSellers().begin(), marketplace_->getSellers().end(),
[&seller](const std::unique_ptr<Seller>& a) { [&seller](const std::unique_ptr<Seller>& a) {
return a->getUuid() == seller->getUuid(); return a->getId() == seller->getId();
}), }),
marketplace_->getSellers().end()); marketplace_->getSellers().end());
emit endRemoveRows(); emit endRemoveRows();
@ -156,4 +155,4 @@ bool SellerModel::removeRows(int row, int count, const QModelIndex& parent)
} }
return false; return false;
} }

8
test/test_seller.cpp
View file

@ -9,14 +9,14 @@
BOOST_AUTO_TEST_CASE(create_uuid_nil) BOOST_AUTO_TEST_CASE(create_uuid_nil)
{ {
Seller seller{}; Seller seller{};
BOOST_TEST(seller.getUuid().is_nil() == true); BOOST_TEST(seller.getId().is_nil() == true);
} }
BOOST_AUTO_TEST_CASE(create_uuid) BOOST_AUTO_TEST_CASE(create_uuid)
{ {
Seller seller{}; Seller seller{};
seller.createUuid(); seller.createUuid();
BOOST_TEST(seller.getUuid().is_nil() == false); BOOST_TEST(seller.getId().is_nil() == false);
} }
BOOST_AUTO_TEST_CASE(create_many) BOOST_AUTO_TEST_CASE(create_many)
@ -25,7 +25,7 @@ BOOST_AUTO_TEST_CASE(create_many)
std::array<Seller, QUANTITY> sellers; std::array<Seller, QUANTITY> sellers;
for (unsigned i = 0; i < sellers.size(); i++) { for (unsigned i = 0; i < sellers.size(); i++) {
sellers[i] = Seller(); sellers[i] = Seller();
sellers[i].createUuid(); //sellers[i].createUuid();
} }
} }
@ -37,4 +37,4 @@ BOOST_AUTO_TEST_CASE(with_article) {
BOOST_TEST((article == nullptr)); BOOST_TEST((article == nullptr));
BOOST_TEST(seller.getArticles(false).at(0)->getDescription() == "Test article"); BOOST_TEST(seller.getArticles(false).at(0)->getDescription() == "Test article");
BOOST_TEST(seller.numArticlesSold() == 0); BOOST_TEST(seller.numArticlesSold() == 0);
} }