work

segoon · segoon · commit 25231f56c687 · 2024-08-15T18:29:49.000+03:00
diff --git a/src/latest.cpp b/src/latest.cpp
@@ -20,8 +20,9 @@ std::string LatestHandler::HandleRequestThrow(
     const userver::server::http::HttpRequest&,
     userver::server::request::RequestContext&) const {
   auto result = pg_->Execute(
-      userver::storages::postgres::ClusterHostType::kSlave,
-      "SELECT author, substring(text for $1::INTEGER) AS text_tr, ip_source "
+      // userver::storages::postgres::ClusterHostType::kSlave,
+      userver::storages::postgres::ClusterHostType::kMaster,
+      "SELECT uuid, author, substring(text for $1::INTEGER) AS text_tr, ip_source "
       "FROM "
       "upastebin.texts ORDER BY created_at DESC LIMIT $2::INTEGER;",
       1000, 10);
@@ -31,6 +32,7 @@ std::string LatestHandler::HandleRequestThrow(
   for (const auto& item : result) {
     userver::formats::json::ValueBuilder response_item;
 
+    response_item["id"] = item["uuid"].As<std::string>();
     response_item["author"] = item["author"].As<std::string>();
     response_item["ip"] = item["ip_source"].As<std::string>();
     response_item["text"] = item["text_tr"].As<std::string>();
diff --git a/src/redirect.hpp b/src/redirect.hpp
@@ -22,7 +22,7 @@ class RedirectHandler final : public userver::server::handlers::HttpHandlerBase
       userver::server::request::RequestContext&) const override {
     auto& response = request.GetHttpResponse();
     response.SetStatus(userver::server::http::HttpStatus::kTemporaryRedirect);
-    response.SetHeader(userver::http::headers::kLocation, "/index.html");
+    response.SetHeader(userver::http::headers::kLocation, "/r/index.html");
     return {};
   }
 };
diff --git a/www-data/index.js b/www-data/index.js
@@ -4,8 +4,9 @@ fetch("../api/v1/latest")
 	})
 	.then(function (json) {
 		latest_html = "";
-		for (const item in json.items) {
-			latest_html += "<p>author: " + item["author"] + "</p>";
+		for (const i in json.items) {
+			const item = json.items[i];
+			latest_html += "<p><a href=\"/" + item.id + "\">author: " + item.author + "</a></p>";
 		}
 		document.getElementById("latest").innerHTML = latest_html;
 	})
diff --git a/www-data/text.html b/www-data/text.html
@@ -1,13 +1,14 @@
 <!DOCTYPE html>
 <html>
   <head>
-  	<meta charset="UTF8">
+    <meta charset="UTF8">
     <title>Pastebin (userver)</title>
-	</head>
-	<body>
+  </head>
+  <body>
     <span id="text"></span>
     <script type="text/javascript" src="r/text.js"></script>
     <span id="latest">unchanged</span>
     <script type="text/javascript" src="r/index.js"></script>
-	</body>
+    <a href="/">Создать новую заметку</a>
+  </body>
 </html>

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class RedirectHandler final : public userver::server::handlers::HttpHandlerBase`
`22`	`22`	`userver::server::request::RequestContext&) const override {`
`23`	`23`	`auto& response = request.GetHttpResponse();`
`24`	`24`	`response.SetStatus(userver::server::http::HttpStatus::kTemporaryRedirect);`
`25`		`- response.SetHeader(userver::http::headers::kLocation, "/index.html");`
	`25`	`+ response.SetHeader(userver::http::headers::kLocation, "/r/index.html");`
`26`	`26`	`return {};`
`27`	`27`	`}`
`28`	`28`	`};`