Merge branch 'main' into contract-variables

Author: ParkerVR

model/equaliq.smithy

@@ -12,8 +12,8 @@ service EqualIQ {
     operations: [
         GetContract
         ListContracts
-        GetDemoContract
-        ListDemoContracts
+        GetSpecialContract
+        ListSpecialContracts
         GetUploadURL
         UpdateContract
         DeleteContract
@@ -124,6 +124,7 @@ operation GetContract {
     ]
 }
 
+
 structure GetContractInput {
     @required
     contractId: ContractId
@@ -155,6 +156,50 @@ structure GetContractOutput {
     sharedWith: UserIdList
 }
 
+
+@http(method: "POST", uri: "/getSpecialContract")
+operation GetSpecialContract {
+    input: GetSpecialContractInput
+    output: GetSpecialContractOutput
+    errors: [
+        AuthenticationError
+        ResourceNotFoundError
+        ProcessingIncompleteError
+        InternalServerError
+    ]
+}
+
+structure GetSpecialContractInput {
+    @required
+    contractId: ContractId
+}
+
+structure GetSpecialContractOutput {
+    @required
+    contractId: ContractId
+
+    @required
+    name: String
+
+    @required
+    type: ContractType
+
+    @required
+    eqmode: Document
+
+    @required
+    sections: Document
+
+    @required
+    isOwner: Boolean
+
+    @required
+    ownerId: UserId
+
+    @required
+    sharedWith: UserIdList
+}
+
 list QASectionsList {
     member: QASection
 }
@@ -201,70 +246,28 @@ structure ListContractsOutput {
     shared: ContractSummaryList
 }
 
-@http(method: "POST", uri: "/getDemoContract")
-operation GetDemoContract {
-    input: GetDemoContractInput
-    output: GetDemoContractOutput
+@http(method: "POST", uri: "/listSpecialContracts")
+operation ListSpecialContracts {
+    input: ListSpecialContractsInput
+    output: ListSpecialContractsOutput
     errors: [
         AuthenticationError
-        ResourceNotFoundError
         InternalServerError
     ]
 }
 
-structure GetDemoContractInput {
-    @required
-    contractId: ContractId
-}
-
-structure GetDemoContractOutput {
-    @required
-    contractId: ContractId
-
-    @required
-    name: String
-
-    @required
-    type: ContractType
-
-    @required
-    terms: TermsList
-
-    @required
-    qa_sections: String
-
-    @required
-    isOwner: Boolean
-
-    @required
-    ownerId: UserId
-
-    @required
-    sharedWith: UserIdList
-}
-
-@http(method: "POST", uri: "/listDemoContracts")
-operation ListDemoContracts {
-    input: ListDemoContractsInput
-    output: ListDemoContractsOutput
-    errors: [
-        AuthenticationError
-        InternalServerError
-    ]
-}
-
-structure ListDemoContractsInput {
+structure ListSpecialContractsInput {
     // Empty input - authentication handled via Bearer token
 }
-
-structure ListDemoContractsOutput {
+structure ListSpecialContractsOutput {
     @required
     owned: ContractSummaryList
 
     @required
     shared: ContractSummaryList
 }
 
+
 list ContractSummaryList {
     member: ContractSummaryItem
 }

python/api_model/types/models.py

@@ -94,10 +94,6 @@ class GetContractSignaturesRequestContent(BaseModel):
     contractId: str
 
 
-class GetDemoContractRequestContent(BaseModel):
-    contractId: str = Field(..., pattern='^[A-Za-z0-9-]+$')
-
-
 class GetProfilePictureRequestContent(BaseModel):
     userId: Optional[str] = Field(None, pattern='^[A-Za-z0-9-]+$')
 
@@ -110,6 +106,21 @@ class GetProfileRequestContent(BaseModel):
     userId: Optional[str] = Field(None, pattern='^[A-Za-z0-9-]+$')
 
 
+class GetSpecialContractRequestContent(BaseModel):
+    contractId: str = Field(..., pattern='^[A-Za-z0-9-]+$')
+
+
+class GetSpecialContractResponseContent(BaseModel):
+    contractId: str = Field(..., pattern='^[A-Za-z0-9-]+$')
+    name: str
+    type: ContractType
+    eqmode: Any
+    sections: Any
+    isOwner: bool
+    ownerId: str = Field(..., pattern='^[A-Za-z0-9-]+$')
+    sharedWith: List[SharedWithItem]
+
+
 class GetUploadURLRequestContent(BaseModel):
     name: str
 
@@ -299,17 +310,6 @@ class GetContractSignaturesResponseContent(BaseModel):
     signatures: Optional[List[ContractSignature]] = None
 
 
-class GetDemoContractResponseContent(BaseModel):
-    contractId: str = Field(..., pattern='^[A-Za-z0-9-]+$')
-    name: str
-    type: ContractType
-    terms: List[Term]
-    qa_sections: str
-    isOwner: bool
-    ownerId: str = Field(..., pattern='^[A-Za-z0-9-]+$')
-    sharedWith: List[SharedWithItem]
-
-
 class GetProfileResponseContent(BaseModel):
     userId: str = Field(..., pattern='^[A-Za-z0-9-]+$')
     profile: UserProfile
@@ -324,7 +324,7 @@ class ListContractsResponseContent(BaseModel):
     shared: List[ContractSummaryItem]
 
 
-class ListDemoContractsResponseContent(BaseModel):
+class ListSpecialContractsResponseContent(BaseModel):
     owned: List[ContractSummaryItem]
     shared: List[ContractSummaryItem]
 

typescript/src/index.ts

@@ -28,17 +28,17 @@ export type GetContractRequestContent = ExtractSchema<'GetContractRequestContent
 export type GetContractResponseContent = ExtractSchema<'GetContractResponseContent'>
 export type GetContractSignaturesRequestContent = ExtractSchema<'GetContractSignaturesRequestContent'>
 export type GetContractSignaturesResponseContent = ExtractSchema<'GetContractSignaturesResponseContent'>
-export type GetDemoContractRequestContent = ExtractSchema<'GetDemoContractRequestContent'>
-export type GetDemoContractResponseContent = ExtractSchema<'GetDemoContractResponseContent'>
 export type GetProfilePictureRequestContent = ExtractSchema<'GetProfilePictureRequestContent'>
 export type GetProfilePictureResponseContent = ExtractSchema<'GetProfilePictureResponseContent'>
 export type GetProfileRequestContent = ExtractSchema<'GetProfileRequestContent'>
 export type GetProfileResponseContent = ExtractSchema<'GetProfileResponseContent'>
+export type GetSpecialContractRequestContent = ExtractSchema<'GetSpecialContractRequestContent'>
+export type GetSpecialContractResponseContent = ExtractSchema<'GetSpecialContractResponseContent'>
 export type GetUploadURLRequestContent = ExtractSchema<'GetUploadURLRequestContent'>
 export type GetUploadURLResponseContent = ExtractSchema<'GetUploadURLResponseContent'>
 export type InternalServerErrorResponseContent = ExtractSchema<'InternalServerErrorResponseContent'>
 export type ListContractsResponseContent = ExtractSchema<'ListContractsResponseContent'>
-export type ListDemoContractsResponseContent = ExtractSchema<'ListDemoContractsResponseContent'>
+export type ListSpecialContractsResponseContent = ExtractSchema<'ListSpecialContractsResponseContent'>
 export type PingResponseContent = ExtractSchema<'PingResponseContent'>
 export type PresignedPostData = ExtractSchema<'PresignedPostData'>
 export type ProcessingIncompleteErrorResponseContent = ExtractSchema<'ProcessingIncompleteErrorResponseContent'>