🔄 Updated workflow

muqimjon · Feb 1, 2024 · d209f35 · d209f35
1 parent f696e81
commit d209f35
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 15 deletions.
diff --git a/.github/workflows/pre-production.yml b/.github/workflows/pre-production.yml
@@ -22,7 +22,7 @@ jobs:
 
 
   build-bot:
-
+    name: Build frontend
     runs-on: ubuntu-latest
 
     steps:
@@ -36,4 +36,4 @@ jobs:
     - name: Build
       run: dotnet build --no-restore
     - name: Test
-      run: dotnet test --no-build --verbosity normal
+      run: dotnet build --configuration Release --output out --verbosity normal /src/frontend/EcoLink.Bot
diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
@@ -41,7 +41,7 @@ jobs:
         echo $DOCKER_PASSWORD | docker login --username $DOCKER_USERNAME --password-stdin
     - name: Build and push
       run: |
-        docker build --tag $DOCKER_USERNAME/$PROJECT-bot --file ./src/backend/EcoLink.WebApi/Dockerfile .
+        docker build --tag $DOCKER_USERNAME/$PROJECT-api --file ./src/backend/EcoLink.WebApi/Dockerfile .
         docker push $DOCKER_USERNAME/$PROJECT-api
 
   build-bot:

diff --git a/src/frontend/EcoLink.Bot/BotServices/Senders/BotUpdateHandler.SendApplication.cs b/src/frontend/EcoLink.Bot/BotServices/Senders/BotUpdateHandler.SendApplication.cs
@@ -370,7 +370,8 @@ private string GetApplicationInForm()
                 user.RequiredFunding,
                 user.AssetsInvested,
                 user.Phone,
-                user.Email],
+                user.Email,
+                user.Profession],
             UserProfession.Investor => localizer["txtApplicationInvestment",
                 user.FirstName,
                 user.LastName,
@@ -379,7 +380,8 @@ private string GetApplicationInForm()
                 user.Sector,
                 user.InvestmentAmount,
                 user.Phone,
-                user.Email],
+                user.Email,
+                user.Profession],
             UserProfession.Representative => localizer["txtApplicationRepresentation",
                 user.FirstName,
                 user.LastName,
@@ -392,7 +394,8 @@ private string GetApplicationInForm()
                 user.Expectation,
                 user.Purpose,
                 user.Phone,
-                user.Email],
+                user.Email,
+                user.Profession],
             UserProfession.ProjectManager => localizer["txtApplicationProjectManagement",
                 user.FirstName,
                 user.LastName,
@@ -405,7 +408,8 @@ private string GetApplicationInForm()
                 user.Expectation,
                 user.Purpose,
                 user.Phone,
-                user.Email],
+                user.Email,
+                user.Profession],
             _ => string.Empty,
         };
     }
@@ -423,7 +427,8 @@ private string GetApplicationInForm(ProjectManagementAppDto dto)
                 dto.Expectation,
                 dto.Purpose,
                 dto.Phone,
-                dto.Email];
+                dto.Email,
+                user.Profession];
 
     private string GetApplicationInForm(EntrepreneurshipAppDto dto)
         => localizer["txtApplicationEntrepreneurship",
@@ -437,7 +442,8 @@ private string GetApplicationInForm(EntrepreneurshipAppDto dto)
                 dto.RequiredFunding,
                 dto.AssetsInvested,
                 dto.Phone,
-                dto.Email];
+                dto.Email,
+                user.Profession];
 
     private string GetApplicationInForm(InvestmentAppDto dto)
         => localizer["txtApplicationInvestment",
@@ -448,7 +454,8 @@ private string GetApplicationInForm(InvestmentAppDto dto)
                 dto.Sector,
                 dto.InvestmentAmount,
                 dto.Phone,
-                dto.Email];
+                dto.Email,
+                user.Profession];
 
     private string GetApplicationInForm(RepresentationAppDto dto)
         => localizer["txtApplicationRepresentation",
@@ -463,5 +470,6 @@ private string GetApplicationInForm(RepresentationAppDto dto)
                 dto.Expectation,
                 dto.Purpose,
                 dto.Phone,
-                dto.Email];
+                dto.Email,
+                user.Profession];
 }
diff --git a/src/frontend/EcoLink.Bot/Resources/BotLocalizer.uz.resx b/src/frontend/EcoLink.Bot/Resources/BotLocalizer.uz.resx
@@ -292,7 +292,9 @@ Tikiladigan aktiv:
 Telefon raqami: 
 ↳     {9}
 Email: 
-↳     {10}</value>
+↳     {10}
+
+Ariza yo'nalishi: {11}</value>
     <comment>Tayyor Arizani tasdiqlash uchun foydalanuvchiga to'liq holda taqdim qilish uchun tadbirkor ma'lumotlari</comment>
   </data>
   <data name="txtApplicationInvestment" xml:space="preserve">
@@ -311,7 +313,9 @@ Yordam:
 Telefon raqami:
 ↳     {6}
 Email: 
-↳     {7}</value>
+↳     {7}
+
+Ariza yo'nalishi: {8}</value>
     <comment>Tayyor Arizani tasdiqlash uchun foydalanuvchiga to'liq holda taqdim qilish uchun investor ma'lumotlari</comment>
   </data>
   <data name="txtApplicationProjectManagement" xml:space="preserve">
@@ -338,7 +342,9 @@ Vakil bo'lishdan maqsad:
 Telefon raqami: 
 ↳     {10}
 Email: 
-↳     {11}</value>
+↳     {11}
+
+Ariza yo'nalishi: {12}</value>
   </data>
   <data name="txtApplicationRepresentation" xml:space="preserve">
     <value>Ism: 
@@ -364,7 +370,9 @@ Vakil bo'lishdan maqsad:
 Telefon raqami: 
 ↳     {10}
 Email: 
-↳     {11}</value>
+↳     {11}
+
+Ariza yo'nalishi: {12}</value>
   </data>
   <data name="txtAskFeedbackForOrganization" xml:space="preserve">
     <value>O'xbekiston Iqtisodiyot Assambleyasi tashkilotining rivoji uchun yana qanday ishlar qilishimiz mumkinligi haqida o'z fikringizni qoldiring. Bu biz uchun juda muhim!</value>