fix(1559): upgrade to Prisma v7 with config restructuring & import updates

.env.demo

@@ -119,8 +119,8 @@ KEYCLOAK_REALM=credebl-platform
 SCHEMA_FILE_SERVER_URL=
 SCHEMA_FILE_SERVER_TOKEN=
 
-GEO_LOCATION_MASTER_DATA_IMPORT_SCRIPT=/prisma/scripts/geo_location_data_import.sh
-UPDATE_CLIENT_CREDENTIAL_SCRIPT=/prisma/scripts/update_client_credential_data.sh
+GEO_LOCATION_MASTER_DATA_IMPORT_SCRIPT=/libs/prisma-service/prisma/scripts/geo_location_data_import.sh
+UPDATE_CLIENT_CREDENTIAL_SCRIPT=/libs/prisma-service/prisma/scripts/update_client_credential_data.sh
 # Note: the below 3 variables are only in case of starting services using docker
 AFJ_AGENT_SPIN_UP=/agent-provisioning/AFJ/scripts/docker_start_agent.sh
 AFJ_AGENT_ENDPOINT_PATH=/agent-provisioning/AFJ/endpoints/

.env.sample

@@ -110,8 +110,8 @@ POOL_DATABASE_URL="" #Provide pooler supabase postgres URL
 CLUSTER_NAME=""  # ecs cluster
 TESKDEFINITION_FAMILY="" # ecs task-definition
 AGENT_PROTOCOL=http
-GEO_LOCATION_MASTER_DATA_IMPORT_SCRIPT=/prisma/scripts/geo_location_data_import.sh
-UPDATE_CLIENT_CREDENTIAL_SCRIPT=/prisma/scripts/update_client_credential_data.sh
+GEO_LOCATION_MASTER_DATA_IMPORT_SCRIPT=/libs/prisma-service/prisma/scripts/geo_location_data_import.sh
+UPDATE_CLIENT_CREDENTIAL_SCRIPT=/libs/prisma-service/prisma/scripts/update_client_credential_data.sh
 
 USER_NKEY_SEED=xxxxxxxxxxxxx // Please provide Nkeys secret for user service
 API_GATEWAY_NKEY_SEED=xxxxxxxxxxxxx // Please provide Nkeys secret for api-gateway

.gitignore

@@ -5,6 +5,7 @@ sonar-project.properties
 .scannerwork/*
 coverage
 libs/prisma-service/prisma/data/credebl-master-table/credebl-master-table.json
+libs/prisma-service/generated/prisma
 uploadedFles/exports
 uploadedFles/import
 uploadedFles/export

README.md

@@ -34,15 +34,13 @@ docker run --name credebl-postgres \
 ### • Run Prisma to Generate Database Schema
 
 ```bash
-cd ./libs/prisma-service/prisma
 npx prisma generate
 npx prisma db push
 ```
 
 ### • Seed Initial Data
 
 ```bash
-cd ./libs/prisma-service
 npx prisma db seed
 ```
 

apps/agent-service/src/agent-service.controller.ts

@@ -27,7 +27,7 @@ import { Controller, Logger } from '@nestjs/common';
 import { InvitationMessage } from '@credebl/common/interfaces/agent-service.interface';
 import { MessagePattern } from '@nestjs/microservices';
 import { SignDataDto } from '../../api-gateway/src/agent-service/dto/agent-service.dto';
-import { user } from '@prisma/client';
+import { user } from '@credebl/prisma/client';
 import {
   IX509ImportCertificateOptionsDto,
   x509CertificateDecodeDto,

apps/agent-service/src/agent-service.service.ts

@@ -58,7 +58,7 @@ import {
 } from './interface/agent-service.interface';
 import { AgentSpinUpStatus, AgentType, DidMethod, Ledgers, OrgAgentType, PromiseResult } from '@credebl/enum/enum';
 import { AgentServiceRepository } from './repositories/agent-service.repository';
-import { Prisma, RecordType, ledgers, org_agents, organisation, platform_config, user } from '@prisma/client';
+import { Prisma, RecordType, ledgers, org_agents, organisation, platform_config, user } from '@credebl/prisma/client';
 import { CommonConstants } from '@credebl/common/common.constant';
 import { CommonService } from '@credebl/common';
 import { GetSchemaAgentRedirection } from 'apps/ledger/src/schema/schema.interface';

apps/agent-service/src/interface/agent-service.interface.ts

@@ -1,5 +1,5 @@
 import { AgentSpinUpStatus } from '@credebl/enum/enum';
-import { Prisma } from '@prisma/client';
+import { Prisma } from '@credebl/prisma/client';
 import { UserRoleOrgPermsDto } from 'apps/api-gateway/src/dtos/user-role-org-perms.dto';
 
 export interface IAgentSpinupDto {

apps/agent-service/src/repositories/agent-service.repository.ts

@@ -22,7 +22,7 @@ import {
   organisation,
   platform_config,
   user
-} from '@prisma/client';
+} from '@credebl/prisma/client';
 
 import { PrismaService } from '@credebl/prisma-service';
 

apps/api-gateway/common/interface.ts

@@ -1,4 +1,4 @@
-import { Prisma } from '@prisma/client';
+import { Prisma } from '@credebl/prisma/client';
 
 export interface ResponseType {
   statusCode: number;

apps/api-gateway/src/agent-service/agent-service.controller.ts

@@ -34,7 +34,7 @@ import IResponseType, { IResponse } from '@credebl/common/interfaces/response.in
 import { AgentSpinupDto, SignDataDto, VerifySignatureDto } from './dto/agent-service.dto';
 import { Response } from 'express';
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-import { user } from '@prisma/client';
+import { user } from '@credebl/prisma/client';
 import { CreateTenantDto } from './dto/create-tenant.dto';
 import { User } from '../authz/decorators/user.decorator';
 import { CustomExceptionFilter } from 'apps/api-gateway/common/exception-handler';

apps/api-gateway/src/agent-service/agent-service.service.ts

@@ -1,5 +1,5 @@
 import { Injectable, Inject } from '@nestjs/common';
-import { user } from '@prisma/client';
+import { user } from '@credebl/prisma/client';
 import { BaseService } from 'libs/service/base.service';
 import { AgentSpinupDto } from './dto/agent-service.dto';
 import { CreateTenantDto } from './dto/create-tenant.dto';

apps/api-gateway/src/authz/authz.controller.ts

@@ -52,7 +52,7 @@ import { ISessionData } from 'apps/user/interfaces/user.interface';
 import { ForbiddenErrorDto } from '../dtos/forbidden-error.dto';
 import { UnauthorizedErrorDto } from '../dtos/unauthorized-error.dto';
 import { User } from './decorators/user.decorator';
-import { user } from '@prisma/client';
+import { user } from '@credebl/prisma/client';
 import * as useragent from 'express-useragent';
 import { EmptyStringParamPipe, TrimStringParamPipe } from '@credebl/common/cast.helper';
 

apps/api-gateway/src/authz/authz.service.ts

@@ -15,10 +15,10 @@ import { ResetPasswordDto } from './dtos/reset-password.dto';
 import { ForgotPasswordDto } from './dtos/forgot-password.dto';
 import { ResetTokenPasswordDto } from './dtos/reset-token-password';
 import { NATSClient } from '@credebl/common/NATSClient';
-import { user } from '@prisma/client';
+import { user } from '@credebl/prisma/client';
 import { IRestrictedUserSession, ISessionDetails } from 'apps/user/interfaces/user.interface';
 import { UserLogoutDto } from './dtos/user-logout.dto';
-import type { Prisma } from '@prisma/client';
+import type { Prisma } from '@credebl/prisma/client';
 import { ClientProxy } from '@nestjs/microservices';
 @Injectable()
 @WebSocketGateway()

apps/api-gateway/src/cloud-wallet/cloud-wallet.controller.ts

@@ -42,7 +42,7 @@ import { CloudBaseWalletConfigureDto } from './dtos/configure-base-wallet.dto';
 import { AuthGuard } from '@nestjs/passport';
 import { User } from '../authz/decorators/user.decorator';
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-import { user } from '@prisma/client';
+import { user } from '@credebl/prisma/client';
 import { Validator } from '@credebl/common/validator';
 import { CommonConstants } from '@credebl/common/common.constant';
 import { UserRoleGuard } from '../authz/guards/user-role.guard';

apps/api-gateway/src/connection/connection.controller.ts

@@ -51,7 +51,7 @@ import { IConnectionSearchCriteria } from '../interfaces/IConnectionSearch.inter
 import { SortFields } from 'apps/connection/src/enum/connection.enum';
 import { BasicMessageDto, QuestionAnswerWebhookDto, QuestionDto } from './dtos/question-answer.dto';
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-import { user } from '@prisma/client';
+import { user } from '@credebl/prisma/client';
 import { TrimStringParamPipe } from '@credebl/common/cast.helper';
 import { ClientProxy } from '@nestjs/microservices';
 @UseFilters(CustomExceptionFilter)

apps/api-gateway/src/connection/connection.service.ts

@@ -16,9 +16,10 @@ import {
   IConnectionSearchCriteria
 } from '../interfaces/IConnectionSearch.interface';
 import { BasicMessageDto, QuestionDto } from './dtos/question-answer.dto';
-import { user } from '@prisma/client';
+import { user } from '@credebl/prisma/client';
 import { NATSClient } from '@credebl/common/NATSClient';
 import { firstValueFrom } from 'rxjs';
+
 @Injectable()
 export class ConnectionService extends BaseService {
   constructor(

apps/api-gateway/src/ecosystem/ecosystem.controller.ts

@@ -38,7 +38,7 @@ import { Roles } from '../authz/decorators/roles.decorator';
 import { UnauthorizedErrorDto } from '../dtos/unauthorized-error.dto';
 import { InviteMemberToEcosystemDto, UpdateEcosystemInvitationDto } from './dtos/send-ecosystem-invitation';
 import { EcosystemRolesGuard } from '../authz/guards/ecosystem-roles.guard';
-import { user } from '@prisma/client';
+import { user } from '@credebl/prisma/client';
 import { User } from '../authz/decorators/user.decorator';
 import { CreateEcosystemDto, PaginationGetAllEcosystem } from 'apps/ecosystem/dtos/create-ecosystem-dto';
 import { DeleteEcosystemOrgDto } from './dtos/delete-ecosystem-users';
@@ -813,7 +813,7 @@ export class EcosystemController {
     description: 'Template details fetched successfully'
   })
   async getTemplateByIntentId(
-   @Param(
+    @Param(
       'orgId',
       TrimStringParamPipe,
       new ParseUUIDPipe({

apps/api-gateway/src/ecosystem/ecosystem.service.ts

@@ -11,7 +11,7 @@ import {
 } from 'apps/ecosystem/interfaces/ecosystem.interfaces';
 import { CreateEcosystemDto } from 'apps/ecosystem/dtos/create-ecosystem-dto';
 // eslint-disable-next-line camelcase
-import { user } from '@prisma/client';
+import { user } from '@credebl/prisma/client';
 import { CreateIntentDto } from 'apps/ecosystem/dtos/create-intent.dto';
 import { UpdateIntentDto } from 'apps/ecosystem/dtos/update-intent.dto';
 import { CreateIntentTemplateDto, UpdateIntentTemplateDto } from '../utilities/dtos/intent-template.dto';
@@ -40,7 +40,11 @@ export class EcosystemService {
    * @param userId
    * @returns All ecosystems from platform
    */
-  async getEcosystems(userId: string, pageDetail: IPaginationSortingDto, orgId:string): Promise<PaginatedResponse<IEcosystem>> {
+  async getEcosystems(
+    userId: string,
+    pageDetail: IPaginationSortingDto,
+    orgId: string
+  ): Promise<PaginatedResponse<IEcosystem>> {
     return this.natsClient.sendNatsMessage(this.serviceProxy, 'get-ecosystems', { userId, pageDetail, orgId });
   }
 

apps/api-gateway/src/issuance/issuance.controller.ts

@@ -74,7 +74,7 @@ import { FileInterceptor } from '@nestjs/platform-express';
 import { v4 as uuidv4 } from 'uuid';
 import { RpcException } from '@nestjs/microservices';
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { user } from '@prisma/client';
+import { user } from '@credebl/prisma/client';
 import { IGetAllIssuedCredentialsDto } from './dtos/get-all-issued-credentials.dto';
 import { IssueCredentialDto } from './dtos/multi-connection.dto';
 import { SchemaType } from '@credebl/enum/enum';

apps/api-gateway/src/issuance/issuance.service.ts

@@ -26,7 +26,8 @@ import {
 import { IssueCredentialDto } from './dtos/multi-connection.dto';
 import { NATSClient } from '@credebl/common/NATSClient';
 import { ClientProxy } from '@nestjs/microservices';
-import { user } from '@prisma/client';
+import { user } from '@credebl/prisma/client';
+
 @Injectable()
 export class IssuanceService extends BaseService {
   constructor(

apps/api-gateway/src/oid4vc-issuance/dtos/oid4vc-issuer-template.dto.ts

@@ -16,7 +16,7 @@ import {
 } from 'class-validator';
 import { ApiExtraModels, ApiProperty, ApiPropertyOptional, getSchemaPath, PartialType } from '@nestjs/swagger';
 import { Type } from 'class-transformer';
-import { SignerOption } from '@prisma/client';
+import { SignerOption } from '@credebl/prisma/client';
 import { AttributeType, CredentialFormat } from '@credebl/enum/enum';
 
 class CredentialAttributeDisplayDto {

apps/api-gateway/src/oid4vc-issuance/oid4vc-issuance.controller.ts

@@ -43,7 +43,7 @@ import { OrgRoles } from 'libs/org-roles/enums';
 import { OrgRolesGuard } from '../authz/guards/org-roles.guard';
 import { CustomExceptionFilter } from 'apps/api-gateway/common/exception-handler';
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { user } from '@prisma/client';
+import { user } from '@credebl/prisma/client';
 import { IssuerCreationDto, IssuerUpdationDto } from './dtos/oid4vc-issuer.dto';
 import { CreateCredentialTemplateDto, UpdateCredentialTemplateDto } from './dtos/oid4vc-issuer-template.dto';
 import { OidcIssueCredentialDto } from './dtos/oid4vc-credential-wh.dto';

apps/api-gateway/src/oid4vc-issuance/oid4vc-issuance.service.ts

@@ -4,7 +4,7 @@ import { ClientProxy } from '@nestjs/microservices';
 import { IssuerCreationDto, IssuerUpdationDto } from './dtos/oid4vc-issuer.dto';
 import { BaseService } from 'libs/service/base.service';
 // eslint-disable-next-line camelcase
-import { oidc_issuer, user } from '@prisma/client';
+import { oidc_issuer, user } from '@credebl/prisma/client';
 import { CreateCredentialTemplateDto, UpdateCredentialTemplateDto } from './dtos/oid4vc-issuer-template.dto';
 import {
   CreateCredentialOfferD2ADto,

apps/api-gateway/src/oid4vc-verification/dtos/oid4vc-verifier-presentation.dto.ts

@@ -16,7 +16,7 @@ import {
 } from 'class-validator';
 import { Type } from 'class-transformer';
 import { ClientIdPrefix, ResponseMode } from '@credebl/enum/enum';
-import { SignerOption } from '@prisma/client';
+import { SignerOption } from '@credebl/prisma/client';
 
 /**
  * DTO for verification-presentation query parameters.

apps/api-gateway/src/oid4vc-verification/dtos/verification-template.dto.ts

@@ -1,6 +1,6 @@
 import { IsEnum, IsNotEmpty, IsObject, IsString } from 'class-validator';
 import { ApiProperty, PartialType } from '@nestjs/swagger';
-import { SignerOption } from '@prisma/client';
+import { SignerOption } from '@credebl/prisma/client';
 
 export class CreateVerificationTemplateDto {
   @ApiProperty({

apps/api-gateway/src/oid4vc-verification/oid4vc-verification.controller.ts

@@ -43,7 +43,7 @@ import { OrgRoles } from 'libs/org-roles/enums';
 import { OrgRolesGuard } from '../authz/guards/org-roles.guard';
 import { CustomExceptionFilter } from 'apps/api-gateway/common/exception-handler';
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { user } from '@prisma/client';
+import { user } from '@credebl/prisma/client';
 import { Oid4vcVerificationService } from './oid4vc-verification.service';
 import { CreateVerifierDto, UpdateVerifierDto } from './dtos/oid4vc-verifier.dto';
 import { PresentationRequestDto, VerificationPresentationQueryDto } from './dtos/oid4vc-verifier-presentation.dto';

apps/api-gateway/src/oid4vc-verification/oid4vc-verification.service.ts

@@ -2,7 +2,7 @@ import { NATSClient } from '@credebl/common/NATSClient';
 import { Inject, Injectable, Logger } from '@nestjs/common';
 import { ClientProxy } from '@nestjs/microservices';
 // eslint-disable-next-line camelcase
-import { oid4vp_verifier, user } from '@prisma/client';
+import { oid4vp_verifier, user } from '@credebl/prisma/client';
 import { CreateVerifierDto, UpdateVerifierDto } from './dtos/oid4vc-verifier.dto';
 import { VerificationPresentationQueryDto } from './dtos/oid4vc-verifier-presentation.dto';
 import { IPresentationRequest } from '@credebl/common/interfaces/oid4vp-verification';

apps/api-gateway/src/organization/organization.controller.ts

@@ -37,7 +37,7 @@ import { UnauthorizedErrorDto } from '../dtos/unauthorized-error.dto';
 import { ForbiddenErrorDto } from '../dtos/forbidden-error.dto';
 import { AuthGuard } from '@nestjs/passport';
 import { User } from '../authz/decorators/user.decorator';
-import { user } from '@prisma/client';
+import { user } from '@credebl/prisma/client';
 import { ResponseMessages } from '@credebl/common/response-messages';
 import { BulkSendInvitationDto } from './dtos/send-invitation.dto';
 import { OrgRolesGuard } from '../authz/guards/org-roles.guard';

apps/api-gateway/src/organization/organization.service.ts

@@ -5,7 +5,7 @@ import { CreateOrganizationDto } from './dtos/create-organization-dto';
 import { BulkSendInvitationDto } from './dtos/send-invitation.dto';
 import { UpdateUserRolesDto } from './dtos/update-user-roles.dto';
 import { UpdateOrganizationDto } from './dtos/update-organization-dto';
-import { organisation, user } from '@prisma/client';
+import { organisation, user } from '@credebl/prisma/client';
 import { IDidList, IGetOrgById, IGetOrganization } from 'apps/organization/interfaces/organization.interface';
 import { IOrgUsers } from 'apps/user/interfaces/user.interface';
 import {

apps/api-gateway/src/platform/platform.controller.ts

@@ -29,7 +29,7 @@ import * as QRCode from 'qrcode';
 import { CredDefSortFields, SchemaType, SortFields } from '@credebl/enum/enum';
 import { GetAllPlatformCredDefsDto } from '../credential-definition/dto/get-all-platform-cred-defs.dto';
 import { TrimStringParamPipe } from '@credebl/common/cast.helper';
-import { user } from '@prisma/client';
+import { user } from '@credebl/prisma/client';
 import { OrgRoles } from 'libs/org-roles/enums';
 import { Roles } from '../authz/decorators/roles.decorator';
 import { OrgRolesGuard } from '../authz/guards/org-roles.guard';

apps/api-gateway/src/user/user.controller.ts

@@ -32,7 +32,7 @@ import { Response } from 'express';
 import { CommonService } from '@credebl/common';
 import IResponse from '@credebl/common/interfaces/response.interface';
 import { ResponseMessages } from '@credebl/common/response-messages';
-import { user } from '@prisma/client';
+import { user } from '@credebl/prisma/client';
 import { AuthGuard } from '@nestjs/passport';
 import { User } from '../authz/decorators/user.decorator';
 import { AcceptRejectInvitationDto } from './dto/accept-reject-invitation.dto';

apps/api-gateway/src/user/user.service.ts

@@ -8,7 +8,7 @@ import { UpdatePlatformSettingsDto } from './dto/update-platform-settings.dto';
 import { IUsersProfile, ICheckUserDetails } from 'apps/user/interfaces/user.interface';
 import { IUsersActivity } from 'libs/user-activity/interface';
 import { IUserInvitations } from '@credebl/common/interfaces/user.interface';
-import { user } from '@prisma/client';
+import { user } from '@credebl/prisma/client';
 import { PaginationDto } from '@credebl/common/dtos/pagination.dto';
 import { NATSClient } from '@credebl/common/NATSClient';
 import { ClientProxy } from '@nestjs/microservices';

apps/api-gateway/src/verification/verification.controller.ts

@@ -49,7 +49,7 @@ import { GetAllProofRequestsDto } from './dto/get-all-proof-requests.dto';
 import { IProofRequestSearchCriteria } from './interfaces/verification.interface';
 import { API_Version, ProofRequestType, SortFields } from './enum/verification.enum';
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-import { user } from '@prisma/client';
+import { user } from '@credebl/prisma/client';
 import { TrimStringParamPipe } from '@credebl/common/cast.helper';
 import { Validator } from '@credebl/common/validator';
 

apps/api-gateway/src/verification/verification.service.ts

@@ -11,7 +11,7 @@ import {
 import { IPresentation, IProofRequest, IProofRequestSearchCriteria } from './interfaces/verification.interface';
 import { IProofPresentation } from './interfaces/verification.interface';
 // To do make a similar interface in API-gateway
-import { user } from '@prisma/client';
+import { user } from '@credebl/prisma/client';
 import { NATSClient } from '@credebl/common/NATSClient';
 import { ClientProxy } from '@nestjs/microservices';
 

apps/api-gateway/src/x509/x509.controller.ts

@@ -30,7 +30,7 @@ import { UnauthorizedErrorDto } from '../dtos/unauthorized-error.dto';
 import { ForbiddenErrorDto } from '../dtos/forbidden-error.dto';
 import { AuthGuard } from '@nestjs/passport';
 import { User } from '../authz/decorators/user.decorator';
-import { user } from '@prisma/client';
+import { user } from '@credebl/prisma/client';
 import { ResponseMessages } from '@credebl/common/response-messages';
 import { OrgRolesGuard } from '../authz/guards/org-roles.guard';
 import { Roles } from '../authz/decorators/roles.decorator';

apps/api-gateway/src/x509/x509.service.ts

@@ -3,7 +3,7 @@ import { Injectable } from '@nestjs/common';
 import { ClientProxy } from '@nestjs/microservices';
 import { BaseService } from 'libs/service/base.service';
 
-import { user } from '@prisma/client';
+import { user } from '@credebl/prisma/client';
 
 import { NATSClient } from '@credebl/common/NATSClient';
 import {