Merge branch 'develop' of https://github.com/code4romania/teo into de…

…velop
code4romania · Dec 4, 2023 · 91bcfbe · 91bcfbe
2 parents 32f79fc + 9fe5f10
commit 91bcfbe
Show file tree

Hide file tree

Showing 26 changed files with 1,657 additions and 1,581 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -10,7 +10,14 @@ assignees: ''
 ### Description
 
 <!--
-A clear and concise description of what the bug is.
+A clear and concise description of what the bug is. Please mention the platform (eg. "On the mobile app, ...")
+-->
+
+### Test environment
+
+<!--
+On which platform did you find this bug, Web or Mobile?
+If Mobile, iOS or Android?
 -->
 
 

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
@@ -2,59 +2,30 @@ on:
   push:
     branches:
       - main
+      - develop
     tags:
-      - "v*"
+      - 'v*'
     paths:
-      - "backend/**"
+      - 'backend/**'
   workflow_dispatch:
 
 name: Build Docker image
 
 jobs:
-  build-docker-image:
-    name: Build Docker image
-    runs-on: ubuntu-latest
-    # These permissions are needed to interact with GitHub's OIDC Token endpoint.
-    permissions:
-      id-token: write
-      contents: read
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          role-to-assume: arn:aws:iam::166485377238:role/github-actions-onghub-ecr
-          aws-region: eu-west-1
-
-      - name: Login to Amazon ECR
-        id: login-ecr
-        uses: aws-actions/amazon-ecr-login@v1
 
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: ${{ steps.login-ecr.outputs.registry }}/teo
-          tags: |
-            type=edge
-            type=ref,event=branch
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          context: backend
-          builder: ${{ steps.buildx.outputs.name }}
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+  build:
+    name: Build Docker image
+    uses: code4romania/.github/.github/workflows/build-push-image-ecr.yml@main
+    with:
+      image_name: vic
+      region: eu-west-1
+      context: backend
+      dockerfile: backend/Dockerfile
+      tags: |
+        type=edge
+        type=ref,event=branch
+        type=semver,pattern={{version}}
+        type=semver,pattern={{major}}.{{minor}}
+        type=semver,pattern={{major}}
+    secrets:
+      role_to_assume: ${{ secrets.ROLE_TO_ASSUME }}
diff --git a/backend/src/api/organization/dto/create-org-structure.dto.ts b/backend/src/api/organization/dto/create-org-structure.dto.ts
@@ -3,7 +3,7 @@ import { OrganizationStructureType } from 'src/modules/organization/enums/organi
 
 export class CreateOrganizationStructureDto {
   @IsString()
-  @MaxLength(20)
+  @MaxLength(50)
   @MinLength(2)
   name: string;
 

diff --git a/backend/src/api/organization/dto/update-org-structure.dto.ts b/backend/src/api/organization/dto/update-org-structure.dto.ts
@@ -2,7 +2,7 @@ import { IsString, MaxLength, MinLength } from 'class-validator';
 
 export class UpdateOrganizationStructureDto {
   @IsString()
-  @MaxLength(20)
+  @MaxLength(50)
   @MinLength(2)
   name: string;
 }