Merge pull request #148 from CapstoneProjectCMC/feature/sap-service-and-payment

add user to block

Author: Fxdonad

src/app/core/interceptors/handle/error-handler.service.ts

@@ -41,6 +41,13 @@ export class ErrorHandlerService {
         'Bạn đã mua sản phẩm này rồi!',
         'warning'
       );
+    } else if (errorCode === 4059101) {
+      sendNotification(
+        this.store,
+        'Hết tiền!',
+        'Bạn cần nạp tiền vào tài khoản của mình trước nhé!',
+        'error'
+      );
     } else {
       sendNotification(
         this.store,

src/app/core/models/organization.model.ts

@@ -86,3 +86,16 @@ export type ParamGetAllBlockOfOrg = {
   activeOnlyMembers?: boolean;
   includeUnassigned?: boolean;
 };
+
+//add user
+export type InfoUserNeedToAdd = {
+  userId: string;
+  role: string;
+  active: string;
+};
+
+export type AddUsersOrgRequest = {
+  members: InfoUserNeedToAdd[];
+  defaultRole: string;
+  active: boolean;
+};

src/app/core/services/api-service/organization.service.ts

@@ -3,6 +3,7 @@ import { ApiMethod } from '../config-service/api.methods';
 import { ApiResponse, IPaginationResponse } from '../../models/api-response';
 import { API_CONFIG } from '../config-service/api.enpoints';
 import {
+  AddUsersOrgRequest,
   BlockResponse,
   CreateOrgRequest,
   EditOrgRequest,
@@ -102,4 +103,11 @@ export class OrganizationService {
       API_CONFIG.ENDPOINTS.GET.GET_BLOCK_DETAILS(blockId, data)
     );
   }
+
+  bulkAddToBlock(blockId: string, data: AddUsersOrgRequest) {
+    return this.api.post<ApiResponse<null>>(
+      API_CONFIG.ENDPOINTS.POST.BULK_ADD_TO_BLOCK(blockId),
+      data
+    );
+  }
 }

src/app/core/services/config-service/api.enpoints.ts

@@ -267,6 +267,9 @@ export const API_CONFIG = {
       PURCHASE: '/payment/purchase',
       CREATE_ORGANIZATION: '/org/organization',
       CREATE_BLOCK_IN_ORG: (orgId: string) => `/org/${orgId}/block`,
+      BULK_ADD_TO_ORG: (orgId: string) => `/org/${orgId}/members:bulk`,
+      BULK_ADD_TO_BLOCK: (blockId: string) =>
+        `/org/block/${blockId}/members:bulk`,
     },
     PUT: {
       EDIT_FILE: (id: string) => `/file/api/FileDocument/edit/${id}`,

src/app/features/excercise/exercise-pages/exercise-code-details/exercise-code-details.component.html

@@ -81,9 +81,7 @@ <h1 class="title">{{ exercise.title }}</h1>
         </div>
         <div class="time-info" title="Giá bài tập">
           <i class="fa-solid fa-money-bill-1-wave"></i>
-          <span>
-            {{ exercise.cost }}
-          </span>
+          <span> {{ exercise.cost | formatView }} VNĐ </span>
         </div>
       </div>
     </div>

src/app/features/excercise/exercise-pages/exercise-code-details/exercise-code-details.component.ts

@@ -31,6 +31,7 @@ import { isAvailabelTime } from '../../../../shared/utils/availableTime';
 import { PaymentService } from '../../../../core/services/api-service/payment.service';
 import { v4 as uuidv4 } from 'uuid';
 import { IPurChaseTransactionRequest } from '../../../../core/models/service-and-payment';
+import { FormatViewPipe } from '../../../../shared/pipes/format-view.pipe';
 
 @Component({
   selector: 'app-exercise-code-details',
@@ -39,6 +40,7 @@ import { IPurChaseTransactionRequest } from '../../../../core/models/service-and
     FormsModule,
     UpdateCodeDetailsComponent,
     UpdateExerciseComponent,
+    FormatViewPipe,
   ],
   templateUrl: './exercise-code-details.component.html',
   styleUrls: ['./exercise-code-details.component.scss'],
@@ -230,6 +232,7 @@ export class ExerciseCodeDetailsComponent {
             this.authorName = res.result.user.displayName;
             this.authorRoles = Array.from(res.result.user.roles).join(', ');
             this.avatarUrl = res.result.user.avatarUrl ?? avatarUrlDefault;
+            this.isBought = res.result.purchased;
           }
           this.isActionActive = activeForMyContent(
             res.result.user?.username ?? '',

src/app/features/excercise/exercise-pages/exercise-details/exercise-details.component.ts

@@ -224,6 +224,7 @@ export class ExerciseDetailsComponent implements OnInit {
             if (res.result.user) {
               this.authorName = res.result.user.displayName;
               this.avatarUrl = res.result.user.avatarUrl;
+              this.isBought = res.result.purchased;
               this.availabelDate = res.result.startTime
                 ? new Date(res.result.startTime)
                 : null;

src/app/features/excercise/exercise-pages/list-exercise/list-exercise.component.ts

@@ -89,7 +89,6 @@ export class ListExerciseComponent implements OnInit {
       { value: '1', label: 'Trung bình' },
       { value: '2', label: 'Khó' },
     ];
-    const role = decodeJWT(localStorage.getItem('token') ?? '')?.payload.scope;
   }
 
   private mapExerciseResToCardDataUI(data: ExerciseItem[]): CardExcercise[] {

src/app/features/organization/organization-component/details-organization/details-organization.component.scss

@@ -108,7 +108,7 @@
 
       .org-name {
         margin: 0;
-        font-size: 28px;
+        font-size: 24px;
         font-weight: 700;
         color: var(--title-text);
         line-height: 1.2;

src/app/features/organization/organization-component/details-organization/details-organization.component.ts

@@ -53,9 +53,9 @@ export class DetailsOrganizationComponent implements OnInit {
     });
   }
 
-  getStatusLabel(status: number): string {
+  getStatusLabel(status: number | string): string {
     switch (status) {
-      case 0:
+      case 'Active':
         return 'Hoạt động';
       case 1:
         return 'Tạm ngưng';
@@ -66,9 +66,9 @@ export class DetailsOrganizationComponent implements OnInit {
     }
   }
 
-  getStatusClass(status: number): string {
+  getStatusClass(status: number | string): string {
     switch (status) {
-      case 0:
+      case 'Active':
         return 'status-active';
       case 1:
         return 'status-inactive';