marsultor/skyward-analysis-daemon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more logiuc errors fixed

Browse Source
This commit is contained in:
Mars Ultor
2025-12-18 23:40:26 -06:00
parent e0da6a2bef
commit 8ea70ef868
2 changed files with 10 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.cpp
View File

@@ -162,7 +162,7 @@ int main (int argc, char *argv[]) {
std::thread update_thread = std::thread { [client_shared_ptr, base_uri](){ std::thread update_thread = std::thread { [client_shared_ptr, base_uri](){
while(true){ while(true){
batched_update(client_shared_ptr, base_uri); batched_update(client_shared_ptr, base_uri);
for (size_t i = 0; i<5; i++) { for (size_t i = 0; i<10; i++) {
sleep(60); sleep(60);
spdlog::info("Daemon is still alive"); spdlog::info("Daemon is still alive");
} }

52
src/types.cpp
View File

@@ -220,28 +220,15 @@ std::string get_or_create_class(const CHClient& client,
if (!class_id.empty()) { if (!class_id.empty()) {
// Update last_seen // Update last_seen
Block update_block; client->Execute(
auto user_col = std::make_shared<ColumnUUID>(); "ALTER TABLE user_classes UPDATE "
auto name_col = std::make_shared<ColumnString>(); "teacher = '" + sanitize_clickhouse_string(class_data.teacher) + "', "
auto teacher_col = std::make_shared<ColumnString>(); "period = '" + sanitize_clickhouse_string(class_data.period) + "', "
auto period_col = std::make_shared<ColumnString>(); "category = '" + sanitize_clickhouse_string(class_data.category) + "', "
auto category_col = std::make_shared<ColumnString>(); "last_seen = now() "
"WHERE class_id = '" + sanitize_clickhouse_string(class_id) + "'"
user_col->Append(parse_uuid(user_id)); );
name_col->Append(class_data.className); return class_id;
teacher_col->Append(class_data.teacher);
period_col->Append(class_data.period);
category_col->Append(class_data.category);
update_block.AppendColumn("user_id", user_col);
update_block.AppendColumn("class_name", name_col);
update_block.AppendColumn("teacher", teacher_col);
update_block.AppendColumn("period", period_col);
update_block.AppendColumn("category", category_col);
client->Insert("user_classes", update_block);
spdlog::debug("Updated existing class: {}", class_id);
return class_id;
} }
// Create new class // Create new class
@@ -307,27 +294,6 @@ std::string get_or_create_assignment(const CHClient& client,
if (!assignment_id.empty()) { if (!assignment_id.empty()) {
// Update last_seen // Update last_seen
Block update_block;
auto class_col = std::make_shared<ColumnUUID>();
auto user_col = std::make_shared<ColumnUUID>();
auto name_col = std::make_shared<ColumnString>();
auto date_col = std::make_shared<ColumnDate>();
auto major_col = std::make_shared<ColumnUInt8>();
class_col->Append(parse_uuid(class_id));
user_col->Append(parse_uuid(user_id));
name_col->Append(assignment_data.name);
date_col->Append(parse_date_to_clickhouse(assignment_data.dueDate));
major_col->Append(assignment_data.isMajorGrade ? 1 : 0);
update_block.AppendColumn("class_id", class_col);
update_block.AppendColumn("user_id", user_col);
update_block.AppendColumn("assignment_name", name_col);
update_block.AppendColumn("due_date", date_col);
update_block.AppendColumn("is_major_grade", major_col);
client->Insert("user_assignments", update_block);
spdlog::debug("Updated existing assignment: {}", assignment_id);
return assignment_id; return assignment_id;
} }