-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #82 from daneshk/main
Fix the issue when there is no associated entries for the given record
- Loading branch information
Showing
20 changed files
with
1,424 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| // Copyright (c) 2024 WSO2 LLC. (http://www.wso2.org). | ||
| // | ||
| // WSO2 LLC. licenses this file to you under the Apache License, | ||
| // Version 2.0 (the "License"); you may not use this file except | ||
| // in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| public type Subscription record {| | ||
| readonly string subscriptionId; | ||
| string userName; | ||
| string apimetadataApiId; | ||
| string apimetadataOrgId; | ||
| |}; | ||
|
|
||
| public type SubscriptionOptionalized record {| | ||
| string subscriptionId?; | ||
| string userName?; | ||
| string apimetadataApiId?; | ||
| string apimetadataOrgId?; | ||
| |}; | ||
|
|
||
| public type SubscriptionWithRelations record {| | ||
| *SubscriptionOptionalized; | ||
| ApiMetadataOptionalized apimetadata?; | ||
| |}; | ||
|
|
||
| public type SubscriptionTargetType typedesc<SubscriptionWithRelations>; | ||
|
|
||
| public type SubscriptionInsert Subscription; | ||
|
|
||
| public type SubscriptionUpdate record {| | ||
| string userName?; | ||
| string apimetadataApiId?; | ||
| string apimetadataOrgId?; | ||
| |}; | ||
|
|
||
| public type ApiMetadata record {| | ||
| readonly string apiId; | ||
| readonly string orgId; | ||
| string apiName; | ||
| string metadata; | ||
|
|
||
| |}; | ||
|
|
||
| public type ApiMetadataOptionalized record {| | ||
| string apiId?; | ||
| string orgId?; | ||
| string apiName?; | ||
| string metadata?; | ||
| |}; | ||
|
|
||
| public type ApiMetadataWithRelations record {| | ||
| *ApiMetadataOptionalized; | ||
| SubscriptionOptionalized subscription?; | ||
| |}; | ||
|
|
||
| public type ApiMetadataTargetType typedesc<ApiMetadataWithRelations>; | ||
|
|
||
| public type ApiMetadataInsert ApiMetadata; | ||
|
|
||
| public type ApiMetadataUpdate record {| | ||
| string apiName?; | ||
| string metadata?; | ||
| |}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| // Copyright (c) 2024 WSO2 LLC. (http://www.wso2.org). | ||
| // | ||
| // WSO2 LLC. licenses this file to you under the Apache License, | ||
| // Version 2.0 (the "License"); you may not use this file except | ||
| // in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| import ballerina/test; | ||
| import ballerina/persist; | ||
|
|
||
| @test:Config { | ||
| groups: ["assoc", "h2"] | ||
| } | ||
| function h2APMNoRelationsTest() returns error? { | ||
| H2ApimClient apimClient = check new (); | ||
|
|
||
| [string, string][] metaId = check apimClient->/apimetadata.post([{ | ||
| apiId: "123457", | ||
| orgId: "wso2", | ||
| apiName: "abc", | ||
| metadata: "metadata" | ||
| }]); | ||
| test:assertEquals(metaId, [["123457", "wso2"]]); | ||
|
|
||
| stream<H2ApimWithSubscriptions, persist:Error?> streamResult = apimClient->/apimetadata(); | ||
| H2ApimWithSubscriptions[] apimResults = check from H2ApimWithSubscriptions apiMetadata in streamResult | ||
| select apiMetadata; | ||
|
|
||
| test:assertEquals(apimResults.length(), 1); | ||
| test:assertEquals(apimResults[0].subscription, ()); | ||
| check apimClient.close(); | ||
| } | ||
|
|
||
| @test:Config { | ||
| groups: ["assoc", "h2"], | ||
| dependsOn: [mssqlAPMNoRelationsTest, mssqlAPMWithRelationsTest] | ||
| } | ||
| function h2APMWithoutRelationsTest() returns error? { | ||
| H2ApimClient apimClient = check new (); | ||
|
|
||
| stream<H2ApimWithoutSubscriptions, persist:Error?> streamResult = apimClient->/apimetadata(); | ||
| H2ApimWithoutSubscriptions[] apimResults = check from H2ApimWithoutSubscriptions apiMetadata in streamResult | ||
| select apiMetadata; | ||
|
|
||
| test:assertEquals(apimResults.length(), 2); | ||
| test:assertEquals(apimResults[0], { | ||
| apiId: "123457", | ||
| orgId: "wso2", | ||
| apiName: "abc", | ||
| metadata: "metadata" | ||
| }); | ||
| check apimClient.close(); | ||
| } | ||
|
|
||
| @test:Config { | ||
| groups: ["assoc", "h2"], | ||
| dependsOn: [h2APMNoRelationsTest] | ||
| } | ||
| function h2APMWithRelationsTest() returns error? { | ||
| H2ApimClient apimClient = check new (); | ||
|
|
||
| [string, string][] metaId = check apimClient->/apimetadata.post([{ | ||
| apiId: "123458", | ||
| orgId: "wso2", | ||
| apiName: "abc", | ||
| metadata: "metadata" | ||
| }]); | ||
| test:assertEquals(metaId, [["123458", "wso2"]]); | ||
|
|
||
| string[] subId = check apimClient->/subscriptions.post([{ | ||
| subscriptionId: "123", | ||
| userName: "ballerina", | ||
| apimetadataApiId: "123458", | ||
| apimetadataOrgId: "wso2" | ||
| }]); | ||
| test:assertEquals(subId, ["123"]); | ||
|
|
||
| stream<H2ApimWithSubscriptions, persist:Error?> streamResult = apimClient->/apimetadata(); | ||
| H2ApimWithSubscriptions[] apimResults = check from H2ApimWithSubscriptions apiMetadata in streamResult | ||
| select apiMetadata; | ||
|
|
||
| test:assertEquals(apimResults.length(), 2); | ||
|
|
||
| test:assertEquals(apimResults[0].subscription, ()); | ||
| test:assertEquals(apimResults[1].subscription, { | ||
| subscriptionId: "123", | ||
| apimetadataApiId: "123458" | ||
| }); | ||
| check apimClient.close(); | ||
| } | ||
|
|
||
| type H2ApimWithSubscriptions record {| | ||
| string apiId; | ||
| string orgId; | ||
| string apiName; | ||
| string metadata; | ||
| record {| | ||
| string subscriptionId; | ||
| string apimetadataApiId; | ||
| |} subscription?; | ||
| |}; | ||
|
|
||
|
|
||
| type H2ApimWithoutSubscriptions record {| | ||
| string apiId; | ||
| string orgId; | ||
| string apiName; | ||
| string metadata; | ||
| |}; |
Oops, something went wrong.