Merge pull request #699 from CDLUC3/develop

Merge Develop to the main branch for adding URL to the batch download report

ezidapp/management/commands/proc-download.py

@@ -265,6 +265,8 @@ def _writeCsv(
                 l.append(id_model.resourcePublicationDate)
             elif c == "_mappedType":
                 l.append(id_model.resourceType)
+            elif c == "_target":
+                l.append(id_model.target)
             else:
                 l.append(metadata.get(c, ""))
         w.writerow([self._csvEncode(c).decode('utf-8', errors='replace') for c in l])

impl/ui_manage.py

@@ -520,6 +520,7 @@ def download(request):
             "_created",
             "_updated",
             "_status",
+            "_target",
         ],
     )
 

pyproject.toml

@@ -42,7 +42,7 @@ python = "^3.8"
 django = "^4.2.14"
 aiomysql = "^0.2.0"
 mysqlclient = "^2.2.4"
-boto3 = "^1.34.143"
+boto3 = "^1.34.155"
 mysql = "^0.0.3"
 myloginpath = "^0.0.4"
 jinja2 = "^3.1.4"
@@ -62,7 +62,7 @@ pymysql = "^1.1.1"
 configparser = "^7.0.0"
 ecs-logging = "^2.2.0"
 celery = "^5.4.0"
-sqlalchemy = "^2.0.31"
+sqlalchemy = "^2.0.32"
 django-matomo-api-tracking = {git = "https://github.com/CDLUC3/django-matomo-api-tracking", rev = "0.1.4"}
 
 

requirements-dev.txt

@@ -1,2 +1,3 @@
 pytest-django~=4.8.0
 pytest-mock~=3.14.0
+rst2html==2020.7.4

templates/doc/apidoc.2.html

@@ -2273,6 +2273,9 @@ <h1>Batch download</h1>
 <li><p class="first">_id</p>
 <p>The identifier.</p>
 </li>
+<li><p class="first">_target</p>
+<p>The resolved URL (Location).</p>
+</li>
 <li><p class="first">_mappedCreator, _mappedTitle, _mappedPublisher, _mappedDate,
 _mappedType</p>
 <p>Creator, title, publisher, date, and type citation metadata as

templates/doc/apidoc.2.rst

@@ -2394,6 +2394,10 @@ encoding is UTF-8 and the metadata is compressed with either gzip_
 
      The identifier.
 
+   - _target
+
+     The resolved URL (Location).
+
    - _mappedCreator, _mappedTitle, _mappedPublisher, _mappedDate,
      _mappedType