Merge pull request #3817 from hotosm/develop

v4.2.0 Release

backend/models/postgis/project.py

@@ -172,8 +172,6 @@ class Project(db.Model):
         default=[
             Editors.ID.value,
             Editors.JOSM.value,
-            Editors.POTLATCH_2.value,
-            Editors.FIELD_PAPERS.value,
             Editors.CUSTOM.value,
         ],
         index=True,
@@ -184,8 +182,6 @@ class Project(db.Model):
         default=[
             Editors.ID.value,
             Editors.JOSM.value,
-            Editors.POTLATCH_2.value,
-            Editors.FIELD_PAPERS.value,
             Editors.CUSTOM.value,
         ],
         index=True,
@@ -333,11 +329,18 @@ def clone(project_id: int, author_id: int):
                 orig_changeset, ""
             )
 
-        # Copy array relationships.
-        for field in ["interests", "campaign", "teams"]:
+        # Populate teams, interests and campaigns
+        teams = []
+        for team in orig.teams:
+            team_data = team.__dict__.copy()
+            team_data.pop("_sa_instance_state")
+            team_data.update({"project_id": new_proj.id})
+            teams.append(ProjectTeams(**team_data))
+        new_proj.teams = teams
+
+        for field in ["interests", "campaign"]:
             value = getattr(orig, field)
             setattr(new_proj, field, value)
-
         new_proj.custom_editor = orig.custom_editor
 
         return new_proj
@@ -401,11 +404,13 @@ def update(self, project_dto: ProjectDTO):
             validation_editors_array.append(Editors[validation_editor].value)
         self.validation_editors = validation_editors_array
         self.country = project_dto.country_tag
+
         # Add list of allowed users, meaning the project can only be mapped by users in this list
         if hasattr(project_dto, "allowed_users"):
             self.allowed_users = []  # Clear existing relationships then re-insert
             for user in project_dto.allowed_users:
                 self.allowed_users.append(user)
+
         # Update teams and projects relationship.
         self.teams = []
         if hasattr(project_dto, "project_teams") and project_dto.project_teams:
@@ -417,6 +422,7 @@ def update(self, project_dto: ProjectDTO):
 
                 role = TeamRoles[team_dto.role].value
                 ProjectTeams(project=self, team=team, role=role)
+
         # Set Project Info for all returned locales
         for dto in project_dto.project_info_locales:
 
@@ -447,6 +453,7 @@ def update(self, project_dto: ProjectDTO):
         else:
             if self.custom_editor:
                 self.custom_editor.delete()
+
         # handle campaign update
         try:
             new_ids = [c.id for c in project_dto.campaigns]
@@ -478,8 +485,9 @@ def update(self, project_dto: ProjectDTO):
         current_ids.sort()
         if new_ids != current_ids:
             self.interests = Interest.query.filter(Interest.id.in_(new_ids)).all()
+
         # try to update country info if that information is not present
-        if len(self.country) == 0:
+        if not self.country:
             self.set_country_info()
 
         db.session.commit()

backend/models/postgis/statuses.py

@@ -80,6 +80,7 @@ class ValidatingNotAllowed(Enum):
     NOT_A_VALIDATION_TEAM = 105
     USER_NOT_TEAM_MEMBER = 106
     PROJECT_HAS_NO_TEAM = 107
+    USER_ALREADY_HAS_TASK_LOCKED = 108
 
 
 class UserGender(Enum):

backend/models/postgis/utils.py

@@ -17,7 +17,7 @@ class InvalidGeoJson(Exception):
 
     def __init__(self, message):
         if current_app:
-            current_app.logger.error(message)
+            current_app.logger.debug(message)
 
 
 class UserLicenseError(Exception):
@@ -31,7 +31,7 @@ class InvalidData(Exception):
 
     def __init__(self, message):
         if current_app:
-            current_app.logger.error(message)
+            current_app.logger.debug(message)
 
 
 class ST_SetSRID(GenericFunction):

backend/services/grid/split_service.py

@@ -17,7 +17,7 @@ class SplitServiceError(Exception):
 
     def __init__(self, message):
         if current_app:
-            current_app.logger.error(message)
+            current_app.logger.debug(message)
 
 
 class SplitService:

backend/services/mapping_service.py

@@ -25,7 +25,7 @@ class MappingServiceError(Exception):
 
     def __init__(self, message):
         if current_app:
-            current_app.logger.error(message)
+            current_app.logger.debug(message)
 
 
 class MappingService:
@@ -96,7 +96,7 @@ def lock_task_for_mapping(lock_task_dto: LockTaskDTO) -> TaskDTO:
                 raise UserLicenseError("User must accept license to map this task")
             else:
                 raise MappingServiceError(
-                    f"Mapping not allowed because: {error_reason.name}"
+                    f"Mapping not allowed because: {error_reason}"
                 )
 
         task.lock_task_for_mapping(lock_task_dto.user_id)

backend/services/messaging/message_service.py

@@ -33,7 +33,7 @@ class MessageServiceError(Exception):
 
     def __init__(self, message):
         if current_app:
-            current_app.logger.error(message)
+            current_app.logger.debug(message)
 
 
 class MessageService:

backend/services/organisation_service.py

@@ -19,7 +19,7 @@ class OrganisationServiceError(Exception):
 
     def __init__(self, message):
         if current_app:
-            current_app.logger.error(message)
+            current_app.logger.debug(message)
 
 
 class OrganisationService:

backend/services/project_admin_service.py

@@ -25,15 +25,15 @@ class ProjectAdminServiceError(Exception):
 
     def __init__(self, message):
         if current_app:
-            current_app.logger.error(message)
+            current_app.logger.debug(message)
 
 
 class ProjectStoreError(Exception):
     """ Custom Exception to notify callers an error occurred with database CRUD operations """
 
     def __init__(self, message):
         if current_app:
-            current_app.logger.error(message)
+            current_app.logger.debug(message)
 
 
 class ProjectAdminService:

backend/services/project_search_service.py

@@ -49,15 +49,15 @@ class ProjectSearchServiceError(Exception):
 
     def __init__(self, message):
         if current_app:
-            current_app.logger.error(message)
+            current_app.logger.debug(message)
 
 
 class BBoxTooBigError(Exception):
     """ Custom Exception to notify callers an error occurred when handling mapping """
 
     def __init__(self, message):
         if current_app:
-            current_app.logger.error(message)
+            current_app.logger.debug(message)
 
 
 class ProjectSearchService:

backend/services/project_service.py

@@ -37,7 +37,7 @@ class ProjectServiceError(Exception):
 
     def __init__(self, message):
         if current_app:
-            current_app.logger.error(message)
+            current_app.logger.debug(message)
 
 
 class ProjectService:

backend/services/team_service.py

@@ -32,15 +32,15 @@ class TeamServiceError(Exception):
 
     def __init__(self, message):
         if current_app:
-            current_app.logger.error(message)
+            current_app.logger.debug(message)
 
 
 class TeamJoinNotAllowed(Exception):
     """ Custom Exception to notify bad user level on joining team """
 
     def __init__(self, message):
         if current_app:
-            current_app.logger.error(message)
+            current_app.logger.debug(message)
 
 
 class TeamService:

backend/services/users/authentication_service.py

@@ -44,7 +44,7 @@ class AuthServiceError(Exception):
 
     def __init__(self, message):
         if current_app:
-            current_app.logger.error(message)
+            current_app.logger.debug(message)
 
 
 class AuthenticationService:

backend/services/users/osm_service.py

@@ -10,7 +10,7 @@ class OSMServiceError(Exception):
 
     def __init__(self, message):
         if current_app:
-            current_app.logger.error(message)
+            current_app.logger.debug(message)
 
 
 class OSMService:

backend/services/users/user_service.py

@@ -43,7 +43,7 @@ class UserServiceError(Exception):
 
     def __init__(self, message):
         if current_app:
-            current_app.logger.error(message)
+            current_app.logger.debug(message)
 
 
 class UserService:

backend/services/validator_service.py

@@ -32,7 +32,7 @@ class ValidatorServiceError(Exception):
 
     def __init__(self, message):
         if current_app:
-            current_app.logger.error(message)
+            current_app.logger.debug(message)
 
 
 class ValidatorService:
@@ -75,9 +75,11 @@ def lock_tasks_for_validation(validation_dto: LockForValidationDTO) -> TaskDTOs:
         if not user_can_validate:
             if error_reason == ValidatingNotAllowed.USER_NOT_ACCEPTED_LICENSE:
                 raise UserLicenseError("User must accept license to map this task")
+            elif error_reason == ValidatingNotAllowed.USER_ALREADY_HAS_TASK_LOCKED:
+                raise ValidatorServiceError("User already has a task locked")
             else:
                 raise ValidatorServiceError(
-                    f"Validation not allowed because: {error_reason.name}"
+                    f"Validation not allowed because: {error_reason}"
                 )
 
         # Lock all tasks for validation

docker-compose.yml

@@ -16,6 +16,7 @@ services:
   backend:
     <<: *backend
     container_name: backend
+    restart: always
     labels:
       - traefik.http.routers.backend.rule=Host(`localhost`) && PathPrefix(`/api/`)
       - traefik.http.services.backend.loadbalancer.server.port=5000
@@ -28,6 +29,7 @@ services:
 
   frontend:
     image: hotosm-tasking-manager:frontend
+    restart: always
     networks:
       - tm-web
     labels:
@@ -37,12 +39,14 @@ services:
   postgresql:
     image: mdillon/postgis:11
     container_name: postgresql
+    restart: always
     env_file: ${ENV_FILE:-tasking-manager.env}
     networks:
       - tm-web
 
   traefik:
     image: traefik:v2.3
+    restart: always
     ports:
       - "80:80"
     volumes:

docs/setup-development.md

@@ -19,7 +19,7 @@ If you don't want to setup a backend server, you can work on frontend developmen
 **Dependencies**
 
 The following dependencies must be available _globally_ on your system:
-* Download and install [NodeJS LTS v10+](https://nodejs.org/en/) and [yarn](https://classic.yarnpkg.com/en/docs/install)
+* Download and install [NodeJS LTS v12+](https://nodejs.org/en/) and [yarn](https://classic.yarnpkg.com/en/docs/install)
 * Go into the `frontend` directory and execute `yarn`.
 
 #### Available Scripts
@@ -61,8 +61,8 @@ The backend is made up of a postgres database and an associated API that calls v
 
 #### Dependencies
 
-* [Python 3.6+](https://www.python.org/downloads/)
-  * Note: The project does not work with Python 2.x. You **will** need Python 3.6+
+* [Python 3.7+](https://www.python.org/downloads/)
+  * Python 3.7 is what HOT uses in production. You can use Python 3.8 too.
 * [PostgreSQL](https://www.postgresql.org/download/) with [PostGIS](https://postgis.net/install/)
 * [pip](https://pip.pypa.io/en/stable/installing/)
 * [libgeos-dev](https://trac.osgeo.org/geos/)