From 04c3a5f9709e3aac0ee8e7e09355d6a0214c6bd8 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Mon, 30 Oct 2023 18:49:10 +0100
Subject: [PATCH 1/7] Add ValueConflictValidator and check for conflicts when
 storing values

---
 rdmo/projects/serializers/v1/__init__.py      |  7 ++--
 .../projects/js/project_questions/services.js | 11 +++++-
 ...ect_questions_form_group_autocomplete.html |  2 ++
 ...project_questions_form_group_checkbox.html |  3 ++
 .../project_questions_form_group_date.html    |  2 ++
 .../project_questions_form_group_file.html    |  2 ++
 .../project_questions_form_group_radio.html   |  2 ++
 .../project_questions_form_group_range.html   |  2 ++
 .../project_questions_form_group_select.html  |  2 ++
 .../project_questions_form_group_text.html    |  2 ++
 ...project_questions_form_group_textarea.html |  2 ++
 .../project_questions_form_group_yesno.html   |  2 ++
 .../projects/project_questions_overview.html  |  3 ++
 .../project_questions_save_error.html         |  2 +-
 .../project_questions_value_errors.html       | 21 ++++++++++++
 rdmo/projects/validators.py                   | 34 +++++++++++++++++--
 16 files changed, 93 insertions(+), 6 deletions(-)
 create mode 100644 rdmo/projects/templates/projects/project_questions_value_errors.html

diff --git a/rdmo/projects/serializers/v1/__init__.py b/rdmo/projects/serializers/v1/__init__.py
index 7e65e7cb9f..a5ec382b30 100644
--- a/rdmo/projects/serializers/v1/__init__.py
+++ b/rdmo/projects/serializers/v1/__init__.py
@@ -8,7 +8,7 @@
 from rdmo.services.validators import ProviderValidator
 
 from ...models import Integration, IntegrationOption, Invite, Issue, IssueResource, Membership, Project, Snapshot, Value
-from ...validators import ValueValidator
+from ...validators import ValueConflictValidator, ValueQuotaValidator
 
 
 class UserSerializer(serializers.ModelSerializer):
@@ -259,7 +259,10 @@ class Meta:
             'unit',
             'external_id'
         )
-        validators = (ValueValidator(), )
+        validators = (
+            ValueConflictValidator(),
+            ValueQuotaValidator()
+        )
 
 
 class MembershipSerializer(serializers.ModelSerializer):
diff --git a/rdmo/projects/static/projects/js/project_questions/services.js b/rdmo/projects/static/projects/js/project_questions/services.js
index efa8e4ea9d..77fabffcc4 100644
--- a/rdmo/projects/static/projects/js/project_questions/services.js
+++ b/rdmo/projects/static/projects/js/project_questions/services.js
@@ -706,6 +706,9 @@ angular.module('project_questions')
     };
 
     service.storeValue = function(value, question, set_prefix, set_index, collection_index) {
+        // reset value errors
+        value.errors = []
+
         if (angular.isDefined(value.removed) && value.removed) {
             // remove additional_input from unselected checkboxes
             value.additional_input = {};
@@ -826,10 +829,16 @@ angular.module('project_questions')
             }, function (response) {
                 if (response.status == 500) {
                     service.error = response;
+                } else if (response.status == 400) {
+                    service.error = true;
+                    value.errors = Object.keys(response.data);
+                } else if (response.status == 404) {
+                    service.error = true;
+                    value.errors = ['not_found']
                 }
             })
         }
-};
+    };
 
     service.storeValues = function() {
         var promises = [];
diff --git a/rdmo/projects/templates/projects/project_questions_form_group_autocomplete.html b/rdmo/projects/templates/projects/project_questions_form_group_autocomplete.html
index e35e795114..2996f3a321 100644
--- a/rdmo/projects/templates/projects/project_questions_form_group_autocomplete.html
+++ b/rdmo/projects/templates/projects/project_questions_form_group_autocomplete.html
@@ -44,6 +44,8 @@
                     </div>
                 </div>
             </div>
+
+            {% include 'projects/project_questions_value_errors.html' %}
         </div>
 
         <div ng-if="question.is_collection">
diff --git a/rdmo/projects/templates/projects/project_questions_form_group_checkbox.html b/rdmo/projects/templates/projects/project_questions_form_group_checkbox.html
index 48ed47be19..bb344cd818 100644
--- a/rdmo/projects/templates/projects/project_questions_form_group_checkbox.html
+++ b/rdmo/projects/templates/projects/project_questions_form_group_checkbox.html
@@ -24,6 +24,9 @@
                         ng-disabled="service.project.read_only"
                         ng-change="service.changed(service.values[question.attribute][valueset.set_prefix][valueset.set_index][$index])" />
                 </label>
+                <div ng-init="value = service.values[question.attribute][valueset.set_prefix][valueset.set_index][$index]">
+                    {% include 'projects/project_questions_value_errors.html' %}
+                </div>
             </div>
         </div>
     </div>
diff --git a/rdmo/projects/templates/projects/project_questions_form_group_date.html b/rdmo/projects/templates/projects/project_questions_form_group_date.html
index 8994983bd5..36e60cf423 100644
--- a/rdmo/projects/templates/projects/project_questions_form_group_date.html
+++ b/rdmo/projects/templates/projects/project_questions_form_group_date.html
@@ -24,6 +24,8 @@
                     ng-change="service.changed(value, true)"
                     ng-class="{'default-value': service.isDefaultValue(question, value)}"/>
             </div>
+
+            {% include 'projects/project_questions_value_errors.html' %}
         </div>
 
         <div ng-if="question.is_collection">
diff --git a/rdmo/projects/templates/projects/project_questions_form_group_file.html b/rdmo/projects/templates/projects/project_questions_form_group_file.html
index 4ddf98dc31..ee0db7fad5 100644
--- a/rdmo/projects/templates/projects/project_questions_form_group_file.html
+++ b/rdmo/projects/templates/projects/project_questions_form_group_file.html
@@ -33,6 +33,8 @@
                     </ul>
                 </label>
             </div>
+
+            {% include 'projects/project_questions_value_errors.html' %}
         </div>
 
         <div ng-if="question.is_collection">
diff --git a/rdmo/projects/templates/projects/project_questions_form_group_radio.html b/rdmo/projects/templates/projects/project_questions_form_group_radio.html
index d1e8f462f6..29e498e8c7 100644
--- a/rdmo/projects/templates/projects/project_questions_form_group_radio.html
+++ b/rdmo/projects/templates/projects/project_questions_form_group_radio.html
@@ -43,6 +43,8 @@
                     </div>
                 </div>
             </div>
+
+            {% include 'projects/project_questions_value_errors.html' %}
         </div>
 
         <div ng-if="question.is_collection">
diff --git a/rdmo/projects/templates/projects/project_questions_form_group_range.html b/rdmo/projects/templates/projects/project_questions_form_group_range.html
index 384f413d59..39fb0552d5 100644
--- a/rdmo/projects/templates/projects/project_questions_form_group_range.html
+++ b/rdmo/projects/templates/projects/project_questions_form_group_range.html
@@ -31,6 +31,8 @@
                         ng-class="{'default-value': service.isDefaultValue(question, value)}"/>
                 </div>
             </div>
+
+            {% include 'projects/project_questions_value_errors.html' %}
         </div>
 
         <div ng-if="question.is_collection">
diff --git a/rdmo/projects/templates/projects/project_questions_form_group_select.html b/rdmo/projects/templates/projects/project_questions_form_group_select.html
index d672b98981..4589371cb0 100644
--- a/rdmo/projects/templates/projects/project_questions_form_group_select.html
+++ b/rdmo/projects/templates/projects/project_questions_form_group_select.html
@@ -28,6 +28,8 @@
                     </option>
                 </select>
             </div>
+
+            {% include 'projects/project_questions_value_errors.html' %}
         </div>
 
         <div ng-if="question.is_collection">
diff --git a/rdmo/projects/templates/projects/project_questions_form_group_text.html b/rdmo/projects/templates/projects/project_questions_form_group_text.html
index d9284bdf56..e3fad422ec 100644
--- a/rdmo/projects/templates/projects/project_questions_form_group_text.html
+++ b/rdmo/projects/templates/projects/project_questions_form_group_text.html
@@ -21,6 +21,8 @@
                     ng-disabled="service.project.read_only"
                     ng-change="service.changed(value)"
                     ng-class="{'default-value': service.isDefaultValue(question, value)}">
+
+                {% include 'projects/project_questions_value_errors.html' %}
             </div>
         </div>
 
diff --git a/rdmo/projects/templates/projects/project_questions_form_group_textarea.html b/rdmo/projects/templates/projects/project_questions_form_group_textarea.html
index 756e21c96e..26baee92a1 100644
--- a/rdmo/projects/templates/projects/project_questions_form_group_textarea.html
+++ b/rdmo/projects/templates/projects/project_questions_form_group_textarea.html
@@ -23,6 +23,8 @@
                     ng-class="{'default-value': service.isDefaultValue(question, value)}">
                 </textarea>
             </div>
+
+            {% include 'projects/project_questions_value_errors.html' %}
         </div>
 
         <div ng-if="question.is_collection">
diff --git a/rdmo/projects/templates/projects/project_questions_form_group_yesno.html b/rdmo/projects/templates/projects/project_questions_form_group_yesno.html
index c06ce86618..31dda7fb79 100644
--- a/rdmo/projects/templates/projects/project_questions_form_group_yesno.html
+++ b/rdmo/projects/templates/projects/project_questions_form_group_yesno.html
@@ -41,6 +41,8 @@
                     </div>
                 </div>
             </div>
+
+            {% include 'projects/project_questions_value_errors.html' %}
         </div>
 
         <div ng-if="question.is_collection">
diff --git a/rdmo/projects/templates/projects/project_questions_overview.html b/rdmo/projects/templates/projects/project_questions_overview.html
index 1ee6ea347b..6058e465a5 100644
--- a/rdmo/projects/templates/projects/project_questions_overview.html
+++ b/rdmo/projects/templates/projects/project_questions_overview.html
@@ -10,6 +10,9 @@
 </ul>
 
 <ul class="list-unstyled">
+    <li>
+        <a href="#" onclick="window.location.reload();">{% trans 'Reload page' %}</a>
+    </li>
     <li>
         <a href="{% url 'projects' %}">{% trans 'Back to my projects' %}</a>
     </li>
diff --git a/rdmo/projects/templates/projects/project_questions_save_error.html b/rdmo/projects/templates/projects/project_questions_save_error.html
index a3d6d90cba..e3a5aba785 100644
--- a/rdmo/projects/templates/projects/project_questions_save_error.html
+++ b/rdmo/projects/templates/projects/project_questions_save_error.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load core_tags %}
 
-    <div class="text-danger" ng-show="service.error">
+    <div class="text-danger" ng-show="service.error.statusText && service.error.status">
         <p>
             {% trans 'An error occurred while saving the answer. Please contact support if this problem persists.' %}
         </p>
diff --git a/rdmo/projects/templates/projects/project_questions_value_errors.html b/rdmo/projects/templates/projects/project_questions_value_errors.html
new file mode 100644
index 0000000000..d8245287ad
--- /dev/null
+++ b/rdmo/projects/templates/projects/project_questions_value_errors.html
@@ -0,0 +1,21 @@
+{% load i18n %}
+
+    <ul class="help-block list-unstyled" ng-if="value.errors.length > 0">
+        <li class="text-danger" ng-repeat="error in value.errors">
+            <span ng-show="error == 'conflict'">
+                {% blocktrans trimmed %}
+                This field could not be saved, since somebody else did so while you were editing.
+                You will need to reload the page to make changes, but your input will be overwritten.
+                {% endblocktrans %}
+            </span>
+            <span ng-show="error == 'not_found'">
+                {% blocktrans trimmed %}
+                This field could not be saved, since somebody else removed it while you were editing.
+                You will need to reload the page to proceed, but your input will be lost.
+                {% endblocktrans %}
+            </span>
+            <span ng-show="error == 'quota'">
+                {% trans 'You reached the file quota for this project.' %}
+            </span>
+        </li>
+    </ul>
diff --git a/rdmo/projects/validators.py b/rdmo/projects/validators.py
index 3c60a66a32..bffa0020e8 100644
--- a/rdmo/projects/validators.py
+++ b/rdmo/projects/validators.py
@@ -1,4 +1,6 @@
 from django.conf import settings
+from django.core.exceptions import ObjectDoesNotExist
+from django.utils.dateparse import parse_datetime
 from django.utils.translation import gettext_lazy as _
 
 from rest_framework import serializers
@@ -7,7 +9,35 @@
 from rdmo.core.utils import human2bytes
 
 
-class ValueValidator:
+class ValueConflictValidator:
+
+    requires_context = True
+
+    def __call__(self, data, serializer):
+        if serializer.instance:
+            # for an update, check if the value was updated in the meantime
+            updated = serializer.context['view'].request.data.get('updated')
+            if parse_datetime(updated) < serializer.instance.updated:
+                raise serializers.ValidationError({
+                    'conflict': [_('A newer version of this value was found.')]
+                })
+        else:
+            # for a new value, check if there is already a value with the same attribute and indexes
+            try:
+                serializer.context['view'].get_queryset().get(
+                    attribute=data.get('attribute'),
+                    set_prefix=data.get('set_prefix'),
+                    set_index=data.get('set_index'),
+                    collection_index=data.get('collection_index')
+                )
+                raise serializers.ValidationError({
+                    'conflict': [_('An existing value for this attribute/set_prefix/set_index/collection_index'
+                                  ' was found.')]
+                })
+            except ObjectDoesNotExist:
+                pass
+
+class ValueQuotaValidator:
 
     requires_context = True
 
@@ -20,5 +50,5 @@ def __call__(self, data, serializer):
 
                 if project.file_size > human2bytes(settings.PROJECT_FILE_QUOTA):
                     raise serializers.ValidationError({
-                        'value': [_('You reached the file quota for this project.')]
+                        'quota': [_('The file quota for this project has been reached.')]
                     }) from e

From 28361212909d78570125aecd34408405a6df926d Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Mon, 30 Oct 2023 18:56:27 +0100
Subject: [PATCH 2/7] Autosave after eraseValue and removeValue

---
 .../static/projects/js/project_questions/services.js      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/rdmo/projects/static/projects/js/project_questions/services.js b/rdmo/projects/static/projects/js/project_questions/services.js
index 77fabffcc4..92b09fc744 100644
--- a/rdmo/projects/static/projects/js/project_questions/services.js
+++ b/rdmo/projects/static/projects/js/project_questions/services.js
@@ -1067,11 +1067,19 @@ angular.module('project_questions')
         service.values[attribute][set_prefix][set_index][collection_index].autocomplete_text = '';
         service.values[attribute][set_prefix][set_index][collection_index].autocomplete_locked = false;
         service.values[attribute][set_prefix][set_index][collection_index].changed = true;
+
+        if (service.settings.project_questions_autosave) {
+            service.save(false);
+        }
     };
 
     service.removeValue = function(attribute, set_prefix, set_index, collection_index) {
         service.values[attribute][set_prefix][set_index][collection_index].removed = true;
         service.values[attribute][set_prefix][set_index][collection_index].changed = true;
+
+        if (service.settings.project_questions_autosave) {
+            service.save(false);
+        }
     };
 
     service.openValueSetFormModal = function(questionset, set_prefix, set_index) {

From 82e9e0453010408b9c999c8f599a04b2a057940f Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Tue, 31 Oct 2023 11:55:03 +0100
Subject: [PATCH 3/7] Add tests for ValueConflictValidator

---
 .../projects/tests/test_validator_conflict.py | 123 ++++++++++++++++++
 rdmo/projects/validators.py                   |   5 +-
 2 files changed, 125 insertions(+), 3 deletions(-)
 create mode 100644 rdmo/projects/tests/test_validator_conflict.py

diff --git a/rdmo/projects/tests/test_validator_conflict.py b/rdmo/projects/tests/test_validator_conflict.py
new file mode 100644
index 0000000000..e48191c6ce
--- /dev/null
+++ b/rdmo/projects/tests/test_validator_conflict.py
@@ -0,0 +1,123 @@
+from datetime import timedelta
+
+import pytest
+
+from rest_framework.exceptions import ValidationError as RestFameworkValidationError
+
+from ..models import Project, Value
+from ..serializers.v1 import ValueSerializer
+from ..validators import ValueConflictValidator
+
+project_id = 1
+attribute_path = attribute__path='individual/single/text'
+
+
+def test_serializer_create(db):
+    class MockedView:
+        project = Project.objects.get(id=project_id)
+
+    value = Value.objects.get(project_id=project_id, snapshot=None, attribute__path=attribute_path)
+
+    validator = ValueConflictValidator()
+    serializer = ValueSerializer()
+    serializer.context['view'] = MockedView()
+
+    validator({
+        'attribute': value.attribute,
+        'set_prefix': value.set_prefix,
+        'set_index': value.set_index,
+        'collection_index': value.collection_index + 1,
+    }, serializer)
+
+
+def test_serializer_create_error(db):
+    class MockedView:
+        project = Project.objects.get(id=project_id)
+
+    value = Value.objects.get(project_id=project_id, snapshot=None, attribute__path=attribute_path)
+
+    validator = ValueConflictValidator()
+    serializer = ValueSerializer()
+    serializer.context['view'] = MockedView()
+
+    with pytest.raises(RestFameworkValidationError):
+        validator({
+            'attribute': value.attribute,
+            'set_prefix': value.set_prefix,
+            'set_index': value.set_index,
+            'collection_index': value.collection_index,
+        }, serializer)
+
+
+def test_serializer_update(db):
+    value = Value.objects.get(project_id=project_id, snapshot=None, attribute__path=attribute_path)
+
+    class MockedRequest:
+        data = {
+            'updated': value.updated .isoformat()
+        }
+
+    class MockedView:
+        request = MockedRequest()
+        project = Project.objects.get(id=project_id)
+
+    validator = ValueConflictValidator()
+    serializer = ValueSerializer()
+    serializer.instance = value
+    serializer.context['view'] = MockedView()
+
+    validator({
+        'attribute': value.attribute,
+        'set_prefix': value.set_prefix,
+        'set_index': value.set_index,
+        'collection_index': value.collection_index,
+    }, serializer)
+
+
+def test_serializer_update_error(db):
+    value = Value.objects.get(project_id=project_id, snapshot=None, attribute__path=attribute_path)
+
+    class MockedRequest:
+        data = {
+            'updated': (value.updated - timedelta(seconds=1)).isoformat()
+        }
+
+    class MockedView:
+        request = MockedRequest()
+        project = Project.objects.get(id=project_id)
+
+    validator = ValueConflictValidator()
+    serializer = ValueSerializer()
+    serializer.instance = value
+    serializer.context['view'] = MockedView()
+
+    with pytest.raises(RestFameworkValidationError):
+        validator({
+            'attribute': value.attribute,
+            'set_prefix': value.set_prefix,
+            'set_index': value.set_index,
+            'collection_index': value.collection_index,
+        }, serializer)
+
+
+def test_serializer_update_missing_updated(db):
+    value = Value.objects.get(project_id=project_id, snapshot=None, attribute__path=attribute_path)
+
+    class MockedRequest:
+        data = {}
+
+    class MockedView:
+        request = MockedRequest()
+        project = Project.objects.get(id=project_id)
+
+    validator = ValueConflictValidator()
+    serializer = ValueSerializer()
+    serializer.instance = value
+    serializer.context['view'] = MockedView()
+
+    validator({
+        'attribute': value.attribute,
+        'set_prefix': value.set_prefix,
+        'set_index': value.set_index,
+        'collection_index': value.collection_index,
+    }, serializer)
diff --git a/rdmo/projects/validators.py b/rdmo/projects/validators.py
index bffa0020e8..086a387f4d 100644
--- a/rdmo/projects/validators.py
+++ b/rdmo/projects/validators.py
@@ -17,14 +17,14 @@ def __call__(self, data, serializer):
         if serializer.instance:
             # for an update, check if the value was updated in the meantime
             updated = serializer.context['view'].request.data.get('updated')
-            if parse_datetime(updated) < serializer.instance.updated:
+            if updated is not None and parse_datetime(updated) < serializer.instance.updated:
                 raise serializers.ValidationError({
                     'conflict': [_('A newer version of this value was found.')]
                 })
         else:
             # for a new value, check if there is already a value with the same attribute and indexes
             try:
-                serializer.context['view'].get_queryset().get(
+                serializer.context['view'].project.values.filter(snapshot=None).get(
                     attribute=data.get('attribute'),
                     set_prefix=data.get('set_prefix'),
                     set_index=data.get('set_index'),
@@ -47,7 +47,6 @@ def __call__(self, data, serializer):
                 serializer.context['view'].get_object()
             except AssertionError as e:
                 project = serializer.context['view'].project
-
                 if project.file_size > human2bytes(settings.PROJECT_FILE_QUOTA):
                     raise serializers.ValidationError({
                         'quota': [_('The file quota for this project has been reached.')]

From 01889d2ff6f7d3c3a2879e49ec18cf7854eee34e Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Tue, 31 Oct 2023 11:55:27 +0100
Subject: [PATCH 4/7] Fix human2bytes utils function

---
 rdmo/core/tests/test_utils.py | 14 +++++++++++++-
 rdmo/core/utils.py            |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/rdmo/core/tests/test_utils.py b/rdmo/core/tests/test_utils.py
index f0d9bfb119..87596487fd 100644
--- a/rdmo/core/tests/test_utils.py
+++ b/rdmo/core/tests/test_utils.py
@@ -1,6 +1,6 @@
 import pytest
 
-from rdmo.core.utils import join_url, sanitize_url
+from rdmo.core.utils import human2bytes, join_url, sanitize_url
 
 urls = (
     ('', ''),
@@ -23,3 +23,15 @@ def test_sanitize_url(url, sanitized_url):
 
 def test_join_url():
     assert join_url('https://example.com//', '/terms', 'foo') == 'https://example.com/terms/foo'
+
+
+def test_human2bytes():
+    assert human2bytes('1Gb') == 1e+9
+
+
+def test_human2bytes_none():
+    assert human2bytes(None) == 0
+
+
+def test_human2bytes_zero():
+    assert human2bytes('0') == 0
diff --git a/rdmo/core/utils.py b/rdmo/core/utils.py
index 22d9d42b31..dbafe17f3a 100644
--- a/rdmo/core/utils.py
+++ b/rdmo/core/utils.py
@@ -351,7 +351,7 @@ def copy_model(instance, **kwargs):
 
 
 def human2bytes(string):
-    if not string:
+    if not string or string == '0':
         return 0
 
     m = re.match(r'([0-9.]+)\s*([A-Za-z]+)', string)

From 43a4f663ce5223e604425ccfd23d414ddd69d5bd Mon Sep 17 00:00:00 2001
From: David Wallace <david.wallace@tu-darmstadt.de>
Date: Tue, 31 Oct 2023 17:22:35 +0100
Subject: [PATCH 5/7] chore: refactor human2bytes utils func

---
 rdmo/core/constants.py        | 18 ++++++++++++++++++
 rdmo/core/tests/test_utils.py | 21 +++++++++++----------
 rdmo/core/utils.py            | 25 +++++--------------------
 3 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/rdmo/core/constants.py b/rdmo/core/constants.py
index 38a3ae6a45..e0c6fccd74 100644
--- a/rdmo/core/constants.py
+++ b/rdmo/core/constants.py
@@ -58,3 +58,21 @@
         'views.add_view', 'views.change_view', 'views.delete_view'
     )
 }
+
+HUMAN2BYTES_MAPPER = {
+    "kb": {"base": 1000, "power": 1},
+    "k": {"base": 1000, "power": 1},
+    "mb": {"base": 1000, "power": 2},
+    "m": {"base": 1000, "power": 2},
+    "gb": {"base": 1000, "power": 3},
+    "g": {"base": 1000, "power": 3},
+    "tb": {"base": 1000, "power": 4},
+    "t": {"base": 1000, "power": 4},
+    "p": {"base": 1000, "power": 5},
+    "pb": {"base": 1000, "power": 5},
+    "kib": {"base": 1024, "power": 1},
+    "mib": {"base": 1024, "power": 2},
+    "gib": {"base": 1024, "power": 3},
+    "tib": {"base": 1024, "power": 4},
+    "pib": {"base": 1024, "power": 5},
+}
diff --git a/rdmo/core/tests/test_utils.py b/rdmo/core/tests/test_utils.py
index 87596487fd..5964a56d50 100644
--- a/rdmo/core/tests/test_utils.py
+++ b/rdmo/core/tests/test_utils.py
@@ -1,3 +1,5 @@
+from typing import Optional
+
 import pytest
 
 from rdmo.core.utils import human2bytes, join_url, sanitize_url
@@ -15,6 +17,12 @@
     (1, ''),
 )
 
+human2bytes_test_values = (
+    ("1Gb", 1e+9),
+    (None, 0),
+    ("0", 0),
+)
+
 
 @pytest.mark.parametrize("url,sanitized_url", urls)
 def test_sanitize_url(url, sanitized_url):
@@ -25,13 +33,6 @@ def test_join_url():
     assert join_url('https://example.com//', '/terms', 'foo') == 'https://example.com/terms/foo'
 
 
-def test_human2bytes():
-    assert human2bytes('1Gb') == 1e+9
-
-
-def test_human2bytes_none():
-    assert human2bytes(None) == 0
-
-
-def test_human2bytes_zero():
-    assert human2bytes('0') == 0
+@pytest.mark.parametrize("human,bytes", human2bytes_test_values)
+def test_human2bytes(human: Optional[str], bytes: float):
+    assert human2bytes(human) == bytes
diff --git a/rdmo/core/utils.py b/rdmo/core/utils.py
index dbafe17f3a..86c598cbaa 100644
--- a/rdmo/core/utils.py
+++ b/rdmo/core/utils.py
@@ -18,6 +18,8 @@
 from defusedcsv import csv
 from markdown import markdown
 
+from .constants import HUMAN2BYTES_MAPPER
+
 log = logging.getLogger(__name__)
 
 
@@ -357,26 +359,9 @@ def human2bytes(string):
     m = re.match(r'([0-9.]+)\s*([A-Za-z]+)', string)
     number, unit = float(m.group(1)), m.group(2).strip().lower()
 
-    if unit == 'kb' or unit == 'k':
-        return number * 1000
-    elif unit == 'mb' or unit == 'm':
-        return number * 1000**2
-    elif unit == 'gb' or unit == 'g':
-        return number * 1000**3
-    elif unit == 'tb' or unit == 't':
-        return number * 1000**4
-    elif unit == 'pb' or unit == 'p':
-        return number * 1000**5
-    elif unit == 'kib':
-        return number * 1024
-    elif unit == 'mib':
-        return number * 1024**2
-    elif unit == 'gib':
-        return number * 1024**3
-    elif unit == 'tib':
-        return number * 1024**4
-    elif unit == 'pib':
-        return number * 1024**5
+    conversion = HUMAN2BYTES_MAPPER[unit]
+    number = number*conversion['base']**(conversion['power'])
+    return number
 
 
 def is_truthy(value):

From c956aea5067597984172a345ed7fed0739655d78 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Tue, 31 Oct 2023 18:37:03 +0100
Subject: [PATCH 6/7] Fix ValueQuotaValidator and add tests

---
 rdmo/projects/tests/test_validator_quota.py | 65 +++++++++++++++++++++
 rdmo/projects/validators.py                 | 15 ++---
 2 files changed, 71 insertions(+), 9 deletions(-)
 create mode 100644 rdmo/projects/tests/test_validator_quota.py

diff --git a/rdmo/projects/tests/test_validator_quota.py b/rdmo/projects/tests/test_validator_quota.py
new file mode 100644
index 0000000000..f700287cac
--- /dev/null
+++ b/rdmo/projects/tests/test_validator_quota.py
@@ -0,0 +1,65 @@
+import pytest
+
+from rest_framework.exceptions import ValidationError as RestFameworkValidationError
+
+from ..serializers.v1 import ValueSerializer
+from ..validators import ValueQuotaValidator
+
+project_id = 1
+attribute_path = attribute__path='individual/single/text'
+
+
+def test_serializer_create_file(db):
+    class MockedProject:
+        file_size = 1
+
+    class MockedView:
+        action = 'create'
+        project = MockedProject()
+
+    validator = ValueQuotaValidator()
+    serializer = ValueSerializer()
+    serializer.context['view'] = MockedView()
+
+    validator({
+        'value_type': 'file'
+    }, serializer)
+
+
+def test_serializer_create_file_error(db, settings):
+    class MockedProject:
+        file_size = 1
+
+    class MockedView:
+        action = 'create'
+        project = MockedProject()
+
+    settings.PROJECT_FILE_QUOTA = '0'
+
+    validator = ValueQuotaValidator()
+    serializer = ValueSerializer()
+    serializer.context['view'] = MockedView()
+
+    with pytest.raises(RestFameworkValidationError):
+        validator({
+            'value_type': 'file'
+        }, serializer)
+
+
+def test_serializer_create_text(db, settings):
+    class MockedProject:
+        file_size = 1
+
+    class MockedView:
+        action = 'create'
+        project = MockedProject()
+
+    settings.PROJECT_FILE_QUOTA = '0'
+
+    validator = ValueQuotaValidator()
+    serializer = ValueSerializer()
+    serializer.context['view'] = MockedView()
+
+    validator({
+        'value_type': 'text'
+    }, serializer)
diff --git a/rdmo/projects/validators.py b/rdmo/projects/validators.py
index 086a387f4d..65f2deebd5 100644
--- a/rdmo/projects/validators.py
+++ b/rdmo/projects/validators.py
@@ -42,12 +42,9 @@ class ValueQuotaValidator:
     requires_context = True
 
     def __call__(self, data, serializer):
-        if data.get('value_type') == VALUE_TYPE_FILE:
-            try:
-                serializer.context['view'].get_object()
-            except AssertionError as e:
-                project = serializer.context['view'].project
-                if project.file_size > human2bytes(settings.PROJECT_FILE_QUOTA):
-                    raise serializers.ValidationError({
-                        'quota': [_('The file quota for this project has been reached.')]
-                    }) from e
+        if serializer.context['view'].action == 'create' and data.get('value_type') == VALUE_TYPE_FILE:
+            project = serializer.context['view'].project
+            if project.file_size > human2bytes(settings.PROJECT_FILE_QUOTA):
+                raise serializers.ValidationError({
+                    'quota': [_('The file quota for this project has been reached.')]
+                })

From e9566498249438126c5ecf49671a841f732f3eda Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Tue, 31 Oct 2023 18:43:22 +0100
Subject: [PATCH 7/7] Update HUMAN2BYTES_MAPPER and add test

---
 rdmo/core/constants.py                      |  1 +
 rdmo/projects/tests/test_validator_quota.py | 23 ++++++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/rdmo/core/constants.py b/rdmo/core/constants.py
index e0c6fccd74..1e1cbc3a78 100644
--- a/rdmo/core/constants.py
+++ b/rdmo/core/constants.py
@@ -60,6 +60,7 @@
 }
 
 HUMAN2BYTES_MAPPER = {
+    "b": {"base": 1000, "power": 0},
     "kb": {"base": 1000, "power": 1},
     "k": {"base": 1000, "power": 1},
     "mb": {"base": 1000, "power": 2},
diff --git a/rdmo/projects/tests/test_validator_quota.py b/rdmo/projects/tests/test_validator_quota.py
index f700287cac..4eee080e26 100644
--- a/rdmo/projects/tests/test_validator_quota.py
+++ b/rdmo/projects/tests/test_validator_quota.py
@@ -9,7 +9,7 @@
 attribute_path = attribute__path='individual/single/text'
 
 
-def test_serializer_create_file(db):
+def test_serializer_create_file(db, settings):
     class MockedProject:
         file_size = 1
 
@@ -17,6 +17,8 @@ class MockedView:
         action = 'create'
         project = MockedProject()
 
+    settings.PROJECT_FILE_QUOTA = '1b'
+
     validator = ValueQuotaValidator()
     serializer = ValueSerializer()
     serializer.context['view'] = MockedView()
@@ -63,3 +65,22 @@ class MockedView:
     validator({
         'value_type': 'text'
     }, serializer)
+
+
+def test_serializer_update(db, settings):
+    class MockedProject:
+        file_size = 1
+
+    class MockedView:
+        action = 'update'
+        project = MockedProject()
+
+    settings.PROJECT_FILE_QUOTA = '0'
+
+    validator = ValueQuotaValidator()
+    serializer = ValueSerializer()
+    serializer.context['view'] = MockedView()
+
+    validator({
+        'value_type': 'file'
+    }, serializer)