Skip to content

Dev frozen lemon #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Aug 18, 2025
Merged

Dev frozen lemon #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
379e2bc
feat: Extract the main view display
FrozenLemonTee Aug 18, 2025
220dc4f
refactor: Delete test functions
FrozenLemonTee Aug 18, 2025
1e9d2c4
refactor: Fix the issues with time and date format
FrozenLemonTee Aug 18, 2025
217fcfc
feat: Add the logic for inserting Pomodoro record
FrozenLemonTee Aug 18, 2025
8cb9df2
refactor: Rename field of Pomodoro
FrozenLemonTee Aug 18, 2025
326c2d5
fix: Fix the database-related issues of the Pomodoro
FrozenLemonTee Aug 18, 2025
8bae0bb
refactor: Integrate MainView into ViewLayer
FrozenLemonTee Aug 18, 2025
81d566c
refactor: Modify the UI display of the Pomodoro view.
FrozenLemonTee Aug 18, 2025
6475358
refactor: Refactor insertPomoRecord
FrozenLemonTee Aug 18, 2025
668c989
feat: Add getHabitCheckInCount
FrozenLemonTee Aug 18, 2025
ca44f8b
refactor: Refactor insertPomoRecord
FrozenLemonTee Aug 18, 2025
a86fb05
refactor: Integrate MainView into ViewLayer
FrozenLemonTee Aug 18, 2025
387d52d
refactor: Change headers
FrozenLemonTee Aug 18, 2025
7ac3c97
refactor: Add modifiers
FrozenLemonTee Aug 18, 2025
2312f83
refactor: Rename getRecordByDate
FrozenLemonTee Aug 18, 2025
fb92e1e
style: Remove redundant code
FrozenLemonTee Aug 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 69 additions & 71 deletions src/DBLayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#include "DBLayer.h"

#include "Utility.h"
#include <QSqlDatabase>
#include <QSqlQuery>
#include <QSqlError>
#include <utility>

#include "Utility.h"

DBLayer::DBLayer(std::string db_file_name) : db_file_name_(std::move(db_file_name))
{
Expand Down Expand Up @@ -70,7 +72,8 @@ DBLayer::DBLayer(std::string db_file_name) : db_file_name_(std::move(db_file_nam
"userId INTEGER, "
"recordDate TEXT, "
"recordTime TEXT, "
"record TEXT)";
"recordDuration TEXT, "
"recordMark TEXT)";
if (!query.exec(pomoSql))
{
qDebug() << "PomodoroTable 创建失败：" << query.lastError().text();
Expand Down Expand Up @@ -193,7 +196,7 @@ std::vector<Habit> DBLayer::getHabitLists() const
return habits;
}

bool DBLayer::insertHabit(const Habit &habit)
bool DBLayer::insertHabit(const Habit &habit) const
{
if (!openDatabase())
{
Expand Down Expand Up @@ -222,7 +225,7 @@ bool DBLayer::insertHabit(const Habit &habit)
return true;
}

bool DBLayer::updateHabit(const Habit &habit)
bool DBLayer::updateHabit(const Habit &habit) const
{
if (!openDatabase())
{
Expand Down Expand Up @@ -253,7 +256,7 @@ bool DBLayer::updateHabit(const Habit &habit)
return true;
}

bool DBLayer::deleteHabit(std::size_t habit_id)
bool DBLayer::deleteHabit(std::size_t habit_id) const
{
if (!openDatabase())
{
Expand All @@ -274,7 +277,7 @@ bool DBLayer::deleteHabit(std::size_t habit_id)
return true;
}

bool DBLayer::insertHabitRecord(const Habit &habit)
bool DBLayer::insertHabitRecord(const Habit &habit) const
{
if (!openDatabase())
{
Expand Down Expand Up @@ -341,7 +344,7 @@ std::vector<Event> DBLayer::getEventLists() const
return events;
}

bool DBLayer::insertEvent(const Event &event)
bool DBLayer::insertEvent(const Event &event) const
{
if (!openDatabase())
{
Expand Down Expand Up @@ -371,7 +374,7 @@ bool DBLayer::insertEvent(const Event &event)
return true;
}

bool DBLayer::updateEvent(const Event &event)
bool DBLayer::updateEvent(const Event &event) const
{
if (!openDatabase())
{
Expand Down Expand Up @@ -403,7 +406,7 @@ bool DBLayer::updateEvent(const Event &event)
return true;
}

bool DBLayer::deleteEvent(std::size_t event_id)
bool DBLayer::deleteEvent(std::size_t event_id) const
{
if (!openDatabase())
{
Expand All @@ -424,31 +427,39 @@ bool DBLayer::deleteEvent(std::size_t event_id)
return true;
}

void DBLayer::insertPomoRecord(Pomodoro pomo)
void DBLayer::insertPomoRecord(const Pomodoro& pomo) const
{
if (!openDatabase())
{
qDebug() << "数据库打开失败，无法插入番茄钟记录";
qDebug() << "数据库打开失败：" << db_.lastError().text();
return;
}
Utility utility;

QDateTime currentDateTime = QDateTime::currentDateTime();
QString dateStr = currentDateTime.toString("yyyy-MM-dd");
QString timeStr = currentDateTime.toString("HH:mm:ss");

QSqlQuery query(db_);
query.prepare("INSERT INTO PomodoroTable (userId, recordDate, recordTime, record) "
"VALUES (:userId, :recordDate, :recordTime, :record)");
query.bindValue(":userId", 0); // 假设 userId 为 0
query.bindValue(":recordDate", QString::fromStdString(toString(utility.getCurrentTimeStamp().first)));
query.bindValue(":recordTime", QString::fromStdString(toString(pomo.pomodoro_time)));
query.bindValue(":record", QString::fromStdString(pomo.record));
query.prepare("INSERT INTO PomodoroTable (userId, recordDate, recordTime, recordDuration, recordMark) "
"VALUES (:userId, :recordDate, :recordTime, :recordDuration, :recordMark)");

// 确保所有参数都正确绑定
query.bindValue(":userId", getCurrentUserID());
query.bindValue(":recordDate", dateStr);
query.bindValue(":recordTime", timeStr);
query.bindValue(":recordDuration", QString::fromStdString(toString(pomo.pomodoro_duration)));
query.bindValue(":recordMark", QString::fromStdString(pomo.record));

if (!query.exec())
{
qDebug() << "插入番茄钟记录失败：" << query.lastError().text();
qDebug() << "执行的SQL:" << query.lastQuery();
qDebug() << "绑定的值:" << query.boundValues();
}
closeDatabase();
}

DateRecord DBLayer::getRecordbyDate(Date date) const
DateRecord DBLayer::getRecordByDate(Date date) const
{
std::vector<std::pair<Time, Habit>> habit_records;
std::vector<std::pair<Time, Pomodoro>> pomodoro_records;
Expand Down Expand Up @@ -492,28 +503,28 @@ DateRecord DBLayer::getRecordbyDate(Date date) const
}

// 查询指定日期的事项记录
QSqlQuery eventQuery(db_);
eventQuery.prepare("SELECT * FROM EventTable WHERE eventDate = :date AND isDeleted = 0");
eventQuery.bindValue(":date", dateStr);
QSqlQuery event_query(db_);
event_query.prepare("SELECT * FROM EventTable WHERE eventDate = :date AND isDeleted = 0");
event_query.bindValue(":date", dateStr);

if (!eventQuery.exec())
if (!event_query.exec())
{
qDebug() << "查询指定日期的事项记录失败：" << eventQuery.lastError().text();
qDebug() << "查询指定日期的事项记录失败：" << event_query.lastError().text();
}
else
{
while (eventQuery.next())
while (event_query.next())
{
Event event{
eventQuery.value("eventId").toULongLong(),
eventQuery.value("userId").toULongLong(),
eventQuery.value("title").toString().toStdString(),
dateFromString(eventQuery.value("eventDate").toString().toStdString()),
timeFromString(eventQuery.value("eventTime").toString().toStdString()),
eventQuery.value("remindFlag").toBool(),
timeFromString(eventQuery.value("remindTime").toString().toStdString()),
eventQuery.value("isExpiredFlag").toBool(),
eventQuery.value("isDeleted").toBool()};
event_query.value("eventId").toULongLong(),
event_query.value("userId").toULongLong(),
event_query.value("title").toString().toStdString(),
dateFromString(event_query.value("eventDate").toString().toStdString()),
timeFromString(event_query.value("eventTime").toString().toStdString()),
event_query.value("remindFlag").toBool(),
timeFromString(event_query.value("remindTime").toString().toStdString()),
event_query.value("isExpiredFlag").toBool(),
event_query.value("isDeleted").toBool()};

// 使用事项的时间作为记录时间
Time time = event.event_time;
Expand All @@ -522,38 +533,40 @@ DateRecord DBLayer::getRecordbyDate(Date date) const
}

// 查询指定日期的番茄钟使用记录
QSqlQuery pomodoroQuery(db_);
pomodoroQuery.prepare("SELECT * FROM PomodoroTable WHERE recordDate = :date");
pomodoroQuery.bindValue(":date", dateStr);
QSqlQuery pomodoro_query(db_);
pomodoro_query.prepare("SELECT * FROM PomodoroTable WHERE recordDate = :date");
pomodoro_query.bindValue(":date", dateStr);

if (!pomodoroQuery.exec())
if (!pomodoro_query.exec())
{
qDebug() << "查询指定日期的番茄钟使用记录失败：" << pomodoroQuery.lastError().text();
qDebug() << "查询指定日期的番茄钟使用记录失败：" << pomodoro_query.lastError().text();
}
else
{
while (pomodoroQuery.next())
while (pomodoro_query.next())
{
// 提取数据库中的字段
std::size_t id = pomodoroQuery.value("pomoId").toULongLong();
QString recordTimeStr = pomodoroQuery.value("recordTime").toString();
std::string record = pomodoroQuery.value("record").toString().toStdString();
std::size_t id = pomodoro_query.value("pomoId").toULongLong();
QString record_end_time = pomodoro_query.value("recordTime").toString();
QString record_duration_str = pomodoro_query.value("recordDuration").toString();
std::string record = pomodoro_query.value("recordMark").toString().toStdString();

// 将时间字符串转换为 Time 对象
Time time = timeFromString(recordTimeStr.toStdString());
Time duration = timeFromString(record_duration_str.toStdString());
Time end_time = timeFromString(record_end_time.toStdString());

// 构造 Pomodoro 对象
Pomodoro pomodoro(id, time, record);
Pomodoro pomodoro(id, duration, record);

pomodoro_records.emplace_back(time, pomodoro);
pomodoro_records.emplace_back(end_time, pomodoro);
}
}

closeDatabase();
return DateRecord(habit_records, pomodoro_records, event_records);
}

int DBLayer::getHabitIDMax()
int DBLayer::getHabitIDMax() const
{
if (!openDatabase())
{
Expand All @@ -580,7 +593,7 @@ int DBLayer::getHabitIDMax()
return maxId;
}

int DBLayer::getEventIDMax()
int DBLayer::getEventIDMax() const
{
if (!openDatabase())
{
Expand All @@ -607,7 +620,7 @@ int DBLayer::getEventIDMax()
return maxId;
}

int DBLayer::getPomoIDMax()
int DBLayer::getPomoIDMax() const
{
if (!openDatabase())
{
Expand Down Expand Up @@ -747,32 +760,17 @@ std::size_t DBLayer::getCurrentUserID() const
{
std::size_t currentUserId = 0;

if (!openDatabase())
{
qDebug() << "数据库打开失败，无法获取当前用户ID";
return currentUserId;
}

QSqlQuery query(db_);
query.prepare("SELECT userId FROM UserSettingsTable WHERE isLoggedIn = 1 LIMIT 1");

if (!query.exec())
{
qDebug() << "查询当前用户ID失败：" << query.lastError().text();
closeDatabase();
return currentUserId;
}

if (query.next())
{
if (query.exec() && query.next()) {
currentUserId = query.value("userId").toULongLong();
}

closeDatabase();
return currentUserId;
}

bool DBLayer::setInactiveHabit(std::size_t habit_id)
bool DBLayer::setInactiveHabit(const std::size_t habit_id) const
{
if (!openDatabase())
{
Expand Down Expand Up @@ -803,7 +801,7 @@ bool DBLayer::setInactiveHabit(std::size_t habit_id)
return true;
}

bool DBLayer::setActiveHabit(std::size_t habit_id)
bool DBLayer::setActiveHabit(std::size_t habit_id) const
{
if (!openDatabase())
{
Expand Down Expand Up @@ -834,7 +832,7 @@ bool DBLayer::setActiveHabit(std::size_t habit_id)
return true;
}

bool DBLayer::savePomodoroState(int state, int total_seconds, int remaining_seconds, const std::string& remark, const std::string& start_time)
bool DBLayer::savePomodoroState(int state, int total_seconds, int remaining_seconds, const std::string& remark, const std::string& start_time) const
{
if (!openDatabase())
{
Expand Down Expand Up @@ -882,7 +880,7 @@ bool DBLayer::savePomodoroState(int state, int total_seconds, int remaining_seco
return true;
}

bool DBLayer::loadPomodoroState(int& state, int& total_seconds, int& remaining_seconds, std::string& remark, std::string& start_time)
bool DBLayer::loadPomodoroState(int& state, int& total_seconds, int& remaining_seconds, std::string& remark, std::string& start_time) const
{
if (!openDatabase())
{
Expand Down Expand Up @@ -934,7 +932,7 @@ bool DBLayer::loadPomodoroState(int& state, int& total_seconds, int& remaining_s
return false; // 没有找到状态记录
}

bool DBLayer::clearPomodoroState()
bool DBLayer::clearPomodoroState() const
{
if (!openDatabase())
{
Expand Down
Loading