From 01e0f486f302ffa90a22c1b9f9a308b3700b1a7a Mon Sep 17 00:00:00 2001 From: the-last-pastafarian Date: Wed, 6 Nov 2024 15:28:57 +0100 Subject: [PATCH] Rename some functions and change default values --- server/lib/field_hub/couch_service.ex | 7 ++----- server/lib/field_hub/project.ex | 4 ++-- server/lib/field_hub_web/live/project_show_live.ex | 8 ++++---- server/lib/field_hub_web/live/project_show_live.html.heex | 8 ++++---- server/test/field_hub/couch_service_test.exs | 6 +++--- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/server/lib/field_hub/couch_service.ex b/server/lib/field_hub/couch_service.ex index fd0171fcca..cbf07c112a 100644 --- a/server/lib/field_hub/couch_service.ex +++ b/server/lib/field_hub/couch_service.ex @@ -6,9 +6,6 @@ defmodule FieldHub.CouchService do @moduledoc """ Bundles functions for directly interacting with the CouchDB. """ - alias Cachex - alias ExJsonSchema - alias ElixirLS require Logger @doc """ @@ -347,7 +344,7 @@ defmodule FieldHub.CouchService do - `project_identifier` - The name of the project. ## Example - iex> get_n_last_changes("project_a",1) + iex> get_last_n_changes("project_a",1) [ %{ "changes" => [%{"rev" => "2-4f773e67d44d4bc99008713d9f9d164f"}], @@ -374,7 +371,7 @@ defmodule FieldHub.CouchService do ] """ - def get_n_last_changes(project_identifier, n) do + def get_last_n_changes(project_identifier, n) do HTTPoison.get!( "#{base_url()}/#{project_identifier}/_changes?descending=true&limit=100&include_docs=true", get_user_credentials() diff --git a/server/lib/field_hub/project.ex b/server/lib/field_hub/project.ex index b39dcd8f36..e79b89d85c 100644 --- a/server/lib/field_hub/project.ex +++ b/server/lib/field_hub/project.ex @@ -191,7 +191,7 @@ defmodule FieldHub.Project do name: "development" } """ - def evaluate_project(project_identifier, nb_changes_to_display \\ 2) do + def evaluate_project(project_identifier, n_changes_to_display \\ 2) do project_identifier |> evaluate_database() |> case do @@ -201,7 +201,7 @@ defmodule FieldHub.Project do db_statistics -> file_statistics = evaluate_file_store(project_identifier) - changes = CouchService.get_n_last_changes(project_identifier, nb_changes_to_display) + changes = CouchService.get_last_n_changes(project_identifier, n_changes_to_display) db_statistics = db_statistics diff --git a/server/lib/field_hub_web/live/project_show_live.ex b/server/lib/field_hub_web/live/project_show_live.ex index da25cc3182..b13fdf7070 100644 --- a/server/lib/field_hub_web/live/project_show_live.ex +++ b/server/lib/field_hub_web/live/project_show_live.ex @@ -51,7 +51,7 @@ defmodule FieldHubWeb.ProjectShowLive do |> assign(:confirm_project_name, "") |> assign(:delete_files, false) |> assign(:hide_cache_cleared_message, true) - |> assign(:nb_changes_to_display, 2) + |> assign(:n_changes_to_display, 5) |> read_project_doc() } @@ -62,7 +62,7 @@ defmodule FieldHubWeb.ProjectShowLive do def handle_info( :update_overview, - %{assigns: %{project: project, nb_changes_to_display: number_of_changes}} = socket + %{assigns: %{project: project, n_changes_to_display: number_of_changes}} = socket ) do # Evaluate the project asynchronously. Once the task finishes, it will get picked up # by another handle_info/2 below. @@ -135,7 +135,7 @@ defmodule FieldHubWeb.ProjectShowLive do {:noreply, assign(socket, :new_password, password)} end - def handle_event("last_changes", %{"n-last-changes" => n} = _values, socket) do + def handle_event("change_count_select", %{"n-last-changes" => n} = _values, socket) do {n_integer, _remainder} = Integer.parse(n) stats = Project.evaluate_project(socket.assigns.project, n_integer) @@ -143,7 +143,7 @@ defmodule FieldHubWeb.ProjectShowLive do socket = socket |> assign(:stats, stats) - |> assign(:nb_changes_to_display, n_integer) + |> assign(:n_changes_to_display, n_integer) {:noreply, socket} end diff --git a/server/lib/field_hub_web/live/project_show_live.html.heex b/server/lib/field_hub_web/live/project_show_live.html.heex index a098259a68..38b684ba55 100644 --- a/server/lib/field_hub_web/live/project_show_live.html.heex +++ b/server/lib/field_hub_web/live/project_show_live.html.heex @@ -64,14 +64,14 @@
-
- Show the <%= @nb_changes_to_display %>
last changes + + Show the <%= @n_changes_to_display %>
last changes
diff --git a/server/test/field_hub/couch_service_test.exs b/server/test/field_hub/couch_service_test.exs index 96114570d4..43096ec35e 100644 --- a/server/test/field_hub/couch_service_test.exs +++ b/server/test/field_hub/couch_service_test.exs @@ -176,18 +176,18 @@ defmodule FieldHub.CouchServiceTest do ] = CouchService.get_docs_by_category(@project, ["Image", "Drawing"]) |> Enum.to_list() end - test "get_n_last_changes/1 returns the correct amount of changes last changes" do + test "get_last_n_changes/1 returns the correct amount of changes last changes" do assert [ %{"changes" => [%{"rev" => _}], "id" => _, "seq" => _, "doc" => _}, %{"changes" => [%{"rev" => _}], "id" => _, "seq" => _, "doc" => _}, %{"changes" => [%{"rev" => _}], "id" => _, "seq" => _, "doc" => _}, %{"changes" => [%{"rev" => _}], "id" => _, "seq" => _, "doc" => _}, %{"changes" => [%{"rev" => _}], "id" => _, "seq" => _, "doc" => _} - ] = CouchService.get_n_last_changes(@project, 5) + ] = CouchService.get_last_n_changes(@project, 5) assert [ %{"changes" => [%{"rev" => _}], "id" => _, "seq" => _, "doc" => _}, %{"changes" => [%{"rev" => _}], "id" => _, "seq" => _, "doc" => _} - ] = CouchService.get_n_last_changes(@project, 2) + ] = CouchService.get_last_n_changes(@project, 2) end end