Club Design Summer Update

.github/workflows/main.yml

@@ -21,18 +21,18 @@ jobs:
 
       - name: Clear environment
         run: |
-          docker-compose down --volumes
+          docker compose down --volumes
 
       - name: Build environment
         run: |
-          docker-compose build
+          docker compose build
 
       - name: Run environment
         run: |
-          docker-compose up -d
+          docker compose up -d
 
       # Run tests inside docker environment
       - name: Run tests
         run: |
           docker exec backend-api /etc/scripts/wait-for-it.sh -t 30 core-db:3306 -- echo "Database online"
-          docker exec backend-api pytest
+          docker exec backend-api pytest

deployment/nginx/nginx.conf

@@ -1,7 +1,7 @@
 server {
     listen              443 ssl;
-    ssl_certificate     /etc/nginx/certs/live/sedlab.ppd.chalmers.se/fullchain.pem;
-    ssl_certificate_key /etc/nginx/certs/live/sedlab.ppd.chalmers.se/privkey.pem;
+    ssl_certificate     /etc/letsencrypt/live/clubdesign.systemsengineering.design/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/clubdesign.systemsengineering.design/privkey.pem;
 
     location / {
         proxy_pass http://backend-api:80;

docker-compose.prod.yml

@@ -8,15 +8,15 @@ services:
       - "80:80"
       - "443:443"
     environment:
-      - NGINX_HOST=sedlab.ppd.chalmers.se
+      - NGINX_HOST=clubdesign.systemsengineering.design
       - NGINX_PORT=443
     build:
       context: ./deployment/nginx/
       dockerfile: Dockerfile-tls-termination-proxy
     restart: unless-stopped
     volumes:
-      - C:\Certbot\live\sedlab.ppd.chalmers.se\:/etc/nginx/certs/live/sedlab.ppd.chalmers.se # TLS Certs syslink location
-      - C:\Certbot\archive\sedlab.ppd.chalmers.se\:/etc/nginx/certs/archive/sedlab.ppd.chalmers.se # TLS Certs actual location
+      - /etc/letsencrypt/live/clubdesign.systemsengineering.design/fullchain.pem:/etc/letsencrypt/live/clubdesign.systemsengineering.design/fullchain.pem
+      - /etc/letsencrypt/live/clubdesign.systemsengineering.design/privkey.pem:/etc/letsencrypt/live/clubdesign.systemsengineering.design/privkey.pem
     depends_on:
       - "core-db"
       - "backend-api"

requirements.txt

@@ -1,8 +1,9 @@
 bcrypt==4.0.1
-desim-tool==0.3.3
+desim-tool==0.4.8
 fastapi==0.95.1
 mvmlib==0.5.9
 mysql-connector-python==8.0.33
+numpy==1.26.4
 pandas==2.0.0
 passlib==1.7.4
 pyparsing==3.0.9
@@ -12,6 +13,8 @@ starlette==0.26.1
 uvicorn==0.21.1
 openpyxl==3.1.2
 mysql-statement-builder==0.*
-
+python-magic==0.4.27
 pytest==7.3.1
-httpx==0.24.0
+httpx==0.24.0
+plusminus==0.7.0
+smt

sedbackend/apps/core/authentication/utils.py

@@ -40,7 +40,6 @@ async def verify_scopes(security_scopes: SecurityScopes, token: str = Depends(oa
         raise credentials_exception
 
     logger.debug(f"VERIFY SCOPE: Required scopes: {security_scopes.scopes}, user scopes: {token_data.scopes}")
-
     for scope in security_scopes.scopes:
         if scope not in token_data.scopes:
             logger.warning(f'VERIFY SCOPE: User "{token_data.username}" attempted to access an endpoint without the appropriate scope.')

sedbackend/apps/core/files/models.py

@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Optional
 from datetime import datetime
 import os
 

sedbackend/apps/core/projects/implementation.py

@@ -1,4 +1,4 @@
-from typing import Optional, List, Union
+from typing import Optional, List, Union, Dict
 
 from fastapi import HTTPException, status
 

sedbackend/apps/core/users/storage.py

@@ -199,7 +199,7 @@ def db_search_users(connection: PooledMySQLConnection, username_search_str: str,
     if len(username_search_str) == 0:
         username_search_str = "."
     if len(full_name_search_str) == 0:
-        full_name_search_stmnt = '(`full_name` rlike ? OR `full_name` IS NULL)'
+        full_name_search_stmnt = '(`full_name` rlike ? OR `full_name` IS NULL OR `full_name` = "")'
         full_name_search_str = "."
 
     stmnt = MySQLStatementBuilder(connection)

sedbackend/apps/cvs/design/models.py

@@ -30,7 +30,7 @@ class DesignGroupPost(BaseModel):
 
 class ValueDriverDesignValue(BaseModel):
     vd_id: int
-    value: float
+    value: str
 
     def __eq__(self, other: Any) -> bool:
         return self.vd_id == other.vd_id

sedbackend/apps/cvs/design/storage.py

@@ -230,7 +230,13 @@ def get_all_designs(db_connection: PooledMySQLConnection, design_group_ids: List
         logger.debug(f'Error msg: {e.msg}')
         raise exceptions.DesignGroupNotFoundException
 
-    return [populate_design(result) for result in res]
+    designs = []
+    for result in res:
+        vd_design_values = get_all_vd_design_values(db_connection, result['id'])
+        result.update({'vd_values': vd_design_values})
+        designs.append(populate_design_with_values(result))
+
+    return designs
 
 
 def create_design(db_connection: PooledMySQLConnection, design_group_id: int,
@@ -344,22 +350,15 @@ def delete_design(db_connection: PooledMySQLConnection, design_id: int) -> bool:
 def get_all_drivers_design_group(db_connection: PooledMySQLConnection, design_group_id: int) -> List[ValueDriver]:
     logger.debug(f'Fetching all value drivers for design group {design_group_id}')
 
-    columns = DESIGN_GROUP_DRIVER_COLUMNS + ['id', 'name', 'unit']
+    columns = DESIGN_GROUP_DRIVER_COLUMNS + CVS_VALUE_DRIVER_COLUMNS
     select_statement = MySQLStatementBuilder(db_connection)
     res = select_statement \
         .select(DESIGN_GROUP_DRIVER_TABLE, columns) \
         .inner_join('cvs_value_drivers', 'value_driver = id') \
         .where('design_group = %s', [design_group_id]) \
         .execute(fetch_type=FetchType.FETCH_ALL, dictionary=True)
 
-    vds = []
-    for result in res:
-        vd = ValueDriver(
-            id=result['id'],
-            name=result['name'],
-            unit=result['unit']
-        )
-        vds.append(vd)
+    vds = [populate_value_driver(r) for r in res]
 
     return vds
 

sedbackend/apps/cvs/life_cycle/exceptions.py

@@ -17,3 +17,18 @@ class InvalidNodeType(Exception):
 
 class NodeFailedToUpdateException(Exception):
     pass
+
+class InvalidFileTypeException(Exception):
+    pass
+
+
+class FileSizeException(Exception):
+    pass
+
+
+class ProcessesVcsMatchException(Exception):
+    pass
+
+
+class DSMFileFailedDeletionException(Exception):
+    pass