Work on TODOs

Author: Su5eD

src/api/v1/CMakeLists.txt

@@ -1,13 +1,15 @@
 add_library(api STATIC
+        authors/projects.cc
+        authors/websocket.cc
+
+        projects/docs.cc
+        projects/game.cc
+
         auth.cc
         base.cc
         browse.cc
-        docs.cc
-        game.cc
         error.cc
         moderation.cc
-        projects.cc
-        websocket.cc
         system.cc
 )
 

src/api/v1/projects.cc src/api/v1/authors/projects.ccsrc/api/v1/projects.cc renamed to src/api/v1/authors/projects.cc

@@ -1,6 +1,6 @@
 #include "projects.h"
-#include "base.h"
-#include "error.h"
+#include "../base.h"
+#include "../error.h"
 
 #include <models/UserProject.h>
 #include <schemas/schemas.h>

src/api/v1/projects.h src/api/v1/authors/projects.hsrc/api/v1/projects.h renamed to src/api/v1/authors/projects.h

@@ -34,7 +34,6 @@ namespace api::v1 {
         ADD_METHOD_TO(ProjectsController::getVersions,      "/api/v1/dev/projects/{1:id}/versions",             drogon::Get,    "AuthFilter");
         ADD_METHOD_TO(ProjectsController::getDeployments,   "/api/v1/dev/projects/{1:id}/deployments",          drogon::Get,    "AuthFilter");
         // Deployments
-        // TODO Deployment controller
         ADD_METHOD_TO(ProjectsController::getDeployment,    "/api/v1/dev/deployments/{1:id}",                   drogon::Get,    "AuthFilter");
         ADD_METHOD_TO(ProjectsController::deleteDeployment, "/api/v1/dev/deployments/{1:id}",                   drogon::Delete, "AuthFilter");
         // Project issues

src/api/v1/websocket.cc src/api/v1/authors/websocket.ccsrc/api/v1/websocket.cc renamed to src/api/v1/authors/websocket.cc

@@ -1,9 +1,10 @@
 #include "websocket.h"
-#include "error.h"
-#include "auth.h"
+#include "../auth.h"
+#include "../error.h"
 
-#include <service/database/database.h>
 #include <log/log.h>
+#include <service/database/database.h>
+#include <service/storage/storage.h>
 
 #define WS_DEPLOYMENT "<<hello<<"
 

src/api/v1/websocket.h src/api/v1/authors/websocket.hsrc/api/v1/websocket.h renamed to src/api/v1/authors/websocket.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <service/storage/storage.h>
 #include <drogon/WebSocketController.h>
 
 namespace api::v1 {

src/api/v1/docs.cc src/api/v1/projects/docs.ccsrc/api/v1/docs.cc renamed to src/api/v1/projects/docs.cc

@@ -1,5 +1,5 @@
 #include "docs.h"
-#include "error.h"
+#include "../error.h"
 
 #include <drogon/HttpClient.h>
 #include <models/Project.h>

src/api/v1/docs.h src/api/v1/projects/docs.hsrc/api/v1/docs.h renamed to src/api/v1/projects/docs.h

@@ -2,7 +2,7 @@
 
 #include <drogon/HttpController.h>
 
-#include "base.h"
+#include "../base.h"
 
 namespace api::v1 {
     class DocsController final : public drogon::HttpController<DocsController, false> {

src/api/v1/game.cc src/api/v1/projects/game.ccsrc/api/v1/game.cc renamed to src/api/v1/projects/game.cc

@@ -27,7 +27,7 @@ namespace api::v1 {
 
     Task<> GameController::contentItem(const HttpRequestPtr req, std::function<void(const HttpResponsePtr &)> callback,
                                        const std::string project, const std::string id) const {
-        const auto resolved = co_await BaseProjectController::getProjectWithParams(req, project);
+        const auto resolved = co_await BaseProjectController::getProjectWithParamsCached(req, project);
         requireNonVirtual(resolved);
 
         const auto page = co_await resolved->readContentPage(id);
@@ -51,7 +51,7 @@ namespace api::v1 {
         const auto resolved = co_await BaseProjectController::getProjectWithParams(req, project);
         requireNonVirtual(resolved);
 
-        const auto recipeIds = co_await resolved->getProjectDatabase().getItemRecipes(item);
+        const auto recipeIds = co_await resolved->getProjectDatabase().getRecipesForItem(item);
         nlohmann::json root(nlohmann::json::value_t::array);
         for (const auto &id: recipeIds) {
             if (const auto recipe = co_await resolved->getRecipe(id)) {
@@ -137,7 +137,7 @@ namespace api::v1 {
         const auto layout = co_await content::getRecipeType(resolved, unwrap(ResourceLocation::parse(type)));
         assertFound(layout);
 
-        const auto workbenches = co_await global::database->getRecipeTypeWorkbenches(recipeType->getValueOfId());
+        const auto workbenches = co_await resolved->getProjectDatabase().getRecipeTypeWorkbenches(recipeType->getValueOfId());
         const auto workbenchItems = co_await resolveContentUsage(workbenches);
 
         nlohmann::json root;

src/api/v1/game.h src/api/v1/projects/game.hsrc/api/v1/game.h renamed to src/api/v1/projects/game.h

@@ -2,7 +2,7 @@
 
 #include <drogon/HttpController.h>
 
-#include "base.h"
+#include "../base.h"
 
 namespace api::v1 {
     class GameController final : public drogon::HttpController<GameController, false> {

src/main.cc

@@ -3,15 +3,15 @@
 #include "monitor.h"
 #include "version.h"
 
-#include <api/v1/error.h>
-#include <api/v1/moderation.h>
 #include <api/v1/auth.h>
+#include <api/v1/authors/projects.h>
+#include <api/v1/authors/websocket.h>
 #include <api/v1/browse.h>
-#include <api/v1/docs.h>
-#include <api/v1/game.h>
-#include <api/v1/projects.h>
+#include <api/v1/error.h>
+#include <api/v1/moderation.h>
+#include <api/v1/projects/docs.h>
+#include <api/v1/projects/game.h>
 #include <api/v1/system.h>
-#include <api/v1/websocket.h>
 #include <git2.h>
 #include <log/log.h>
 
@@ -25,6 +25,7 @@
 #include <service/system/game_data.h>
 #include <service/storage/ingestor/recipe/recipe_builtin.h>
 #include <service/project/virtual/virtual.h>
+#include <service/system/startup.h>
 
 using namespace drogon;
 using namespace logging;
@@ -67,7 +68,7 @@ void globalExceptionHandler(const std::exception &e, const HttpRequestPtr &req,
 Task<> runStartupTaks() {
     global::virtualProject = co_await createVirtualProject();
 
-    co_await global::database->failLoadingDeployments();
+    co_await cleanupLoadingDeployments();
     co_await global::gameData->setupGameData();
     co_await global::crowdin->getAvailableLocales();
 }