optimize docker build time

Dockerfile

@@ -30,10 +30,6 @@ RUN apt-get update -y \
         libxml2 \
         media-types
 
-# Fetch project requirements
-##############################################
-COPY --chown=django:django --from=git /git-describe /git-commit /build-date /app/git/
-
 # Create directory structure
 ##############################################
 WORKDIR /app
@@ -53,6 +49,10 @@ RUN python -m pip install --no-cache-dir -r requirements.txt
 WORKDIR /app/src
 RUN python manage.py collectstatic --noinput --clear
 
+# Copy git info
+##############################################
+COPY --chown=django:django --from=git /git-describe /git-commit /build-date /app/git/
+
 EXPOSE 8000
 
 WORKDIR /app/src

README.md

@@ -2,6 +2,8 @@
 
 Manage your RPG party & character using an interactive web app accessible from any browser.
 
+[![Test, build, publish & deploy](https://github.com/Crocmagnon/charasheet/actions/workflows/publish.yaml/badge.svg)](https://github.com/Crocmagnon/charasheet/actions/workflows/publish.yaml)
+
 ## Quick start
 Clone, then
 ```shell

src/character/templates/character/character_details.html

@@ -262,32 +262,36 @@
                         <th scope="row">
                             Points de vie
                             {% if character|managed_by:user %}
-                                <div class="btn-group btn-group-sm float-end" role="group">
+                                <form id="health-controls"
-                                    <button
+                                      hx-post="{% url "character:health_change" pk=character.pk %}"
-                                        hx-get="{% url "character:health_change" pk=character.pk %}?value=ko"
+                                      hx-target="#health-remaining"
-                                        hx-target="#health-remaining"
+                                      hx-swap="innerHTML"
-                                        hx-swap="innerHTML"
+                                      style="display: inline">
-                                        type="button"
+                                    {% csrf_token %}
-                                        class="btn btn-outline-danger"><i class="fa-solid fa-battery-empty"></i></button>
+                                    <div style="width: inherit" class="input-group input-group-sm float-end" role="group">
-                                    <button
+                                        <button
-                                        hx-get="{% url "character:health_change" pk=character.pk %}?value=-1"
+                                            type="submit"
-                                        hx-target="#health-remaining"
+                                            name="action"
-                                        hx-swap="innerHTML"
+                                            value="ko"
-                                        type="button"
+                                            class="btn btn-outline-danger"><i class="fa-solid fa-battery-empty"></i></button>
-                                        class="btn btn-danger"><i class="fa-solid fa-minus"></i></button>
+                                        <button
-                                    <button
+                                            type="submit"
-                                        hx-get="{% url "character:health_change" pk=character.pk %}?value=1"
+                                            name="action"
-                                        hx-target="#health-remaining"
+                                            value="negative"
-                                        hx-swap="innerHTML"
+                                            class="btn btn-danger"><i class="fa-solid fa-minus"></i></button>
-                                        type="button"
+                                        <input aria-label="points de vie à ajouter/retirer" type="text" name="value" style="width: 50px" class="form-control" value="1">
-                                        class="btn btn-success"><i class="fa-solid fa-plus"></i></button>
+                                        <button
-                                    <button
+                                            type="submit"
-                                        hx-get="{% url "character:health_change" pk=character.pk %}?value=max"
+                                            name="action"
-                                        hx-target="#health-remaining"
+                                            value="positive"
-                                        hx-swap="innerHTML"
+                                            class="btn btn-success"><i class="fa-solid fa-plus"></i></button>
-                                        type="button"
+                                        <button
-                                        class="btn btn-outline-success"><i class="fa-solid fa-battery-full"></i></button>
+                                            type="submit"
-                                </div>
+                                            name="action"
+                                            value="max"
+                                            class="btn btn-outline-success"><i class="fa-solid fa-battery-full"></i></button>
+                                    </div>
+                                </form>
                             {% endif %}
                         </th>
                         <td><span id="health-remaining">{{ character.health_remaining }}</span> / {{ character.health_max }}</td>

src/character/tests/test_interactions.py

@@ -93,6 +93,70 @@ def test_create_character(selenium: WebDriver, live_server: LiveServer):
         assert getattr(character, name) == value
 
 
+@pytest.mark.django_db()
+def test_change_health(selenium: WebDriver, live_server: LiveServer):
+    call_command("loaddata", "initial_data")
+    username, password = "user1", "some_password"
+    player = User.objects.create_user(username, password=password)
+    character = baker.make(Character, player=player)
+    character.health_remaining = character.health_max
+    character.save()
+    login(selenium, live_server, username, password)
+    selenium.find_element(
+        By.CSS_SELECTOR,
+        f".character[data-id='{character.id}'] .btn-success",
+    ).click()
+    assert selenium.find_element(By.ID, "health-remaining").text == str(
+        character.health_remaining,
+    )
+
+    controls = selenium.find_element(By.ID, "health-controls")
+
+    controls.find_element(By.CSS_SELECTOR, "button[type='submit'][value='ko']").click()
+    assert selenium.find_element(By.ID, "health-remaining").text == "0"
+
+    controls.find_element(By.CSS_SELECTOR, "button[type='submit'][value='max']").click()
+    assert selenium.find_element(By.ID, "health-remaining").text == str(
+        character.health_max,
+    )
+
+    controls.find_element(
+        By.CSS_SELECTOR,
+        "button[type='submit'][value='positive']",
+    ).click()
+    assert selenium.find_element(By.ID, "health-remaining").text == str(
+        character.health_max,
+    )
+
+    controls.find_element(
+        By.CSS_SELECTOR,
+        "button[type='submit'][value='negative']",
+    ).click()
+    assert selenium.find_element(By.ID, "health-remaining").text == str(
+        character.health_max - 1,
+    )
+
+    health_input = controls.find_element(By.CSS_SELECTOR, "input[name='value']")
+    health_input.clear()
+    health_input.send_keys("5")
+
+    controls.find_element(
+        By.CSS_SELECTOR,
+        "button[type='submit'][value='positive']",
+    ).click()
+    assert selenium.find_element(By.ID, "health-remaining").text == str(
+        character.health_max,
+    )
+
+    controls.find_element(
+        By.CSS_SELECTOR,
+        "button[type='submit'][value='negative']",
+    ).click()
+    assert selenium.find_element(By.ID, "health-remaining").text == str(
+        character.health_max - 5,
+    )
+
+
 @pytest.mark.django_db()
 def test_list_characters(selenium: WebDriver, live_server: LiveServer):
     # Load fixtures

src/character/views.py

@@ -123,7 +123,11 @@ def character_health_change(request, pk: int):
         ),
         pk=pk,
     )
-    value = get_updated_value(request, character.health_remaining, character.health_max)
+    value = post_updated_value(
+        request,
+        character.health_remaining,
+        character.health_max,
+    )
     character.health_remaining = value
     character.save(update_fields=["health_remaining"])
     response = HttpResponse(value)
@@ -232,6 +236,31 @@ def character_luck_points_change(request, pk: int):
     return HttpResponse(value)
 
 
+def post_updated_value(
+    request,
+    remaining_value: float,
+    max_value: float,
+) -> int:
+    action = request.POST.get("action")
+    if action == "ko":
+        return 0
+    if action == "max":
+        return int(max_value)
+
+    multiplier = 0
+    if action == "positive":
+        multiplier = 1
+    elif action == "negative":
+        multiplier = -1
+
+    form_value = int(request.POST.get("value"))
+    remaining_value += form_value * multiplier
+    remaining_value = min([max_value, remaining_value])
+    remaining_value = max([0, remaining_value])
+
+    return int(remaining_value)
+
+
 def get_updated_value(
     request,
     remaining_value: float,