Change #commitEventToDataset method from DatasetCreateService.

kamu-data · Aug 2, 2023 · 38524f2 · 38524f2
1 parent 061687b
commit 38524f2
Show file tree

Hide file tree

Showing 9 changed files with 317 additions and 154 deletions.
diff --git a/src/app/api/dataset.api.ts b/src/app/api/dataset.api.ts
@@ -1,9 +1,11 @@
 import {
     CommitEventToDatasetGQL,
-    CommitEventToDatasetQuery,
+    CommitEventToDatasetMutation,
     CreateDatasetFromSnapshotGQL,
-    CreateDatasetFromSnapshotQuery,
-    CreateEmptyDatasetQuery,
+    CreateDatasetFromSnapshotMutation,
+    CreateEmptyDatasetMutation,
+    DatasetByAccountAndDatasetNameGQL,
+    DatasetByAccountAndDatasetNameQuery,
     DatasetKind,
     GetDatasetSchemaGQL,
     GetDatasetSchemaQuery,
@@ -30,6 +32,7 @@ import {
     DatasetByIdGQL,
     CreateEmptyDatasetGQL,
 } from "./kamu.graphql.interface";
+import { MutationResult } from "apollo-angular";
 
 @Injectable({ providedIn: "root" })
 export class DatasetApi {
@@ -40,6 +43,7 @@ export class DatasetApi {
         private datasetsByAccountNameGQL: DatasetsByAccountNameGQL,
         private metadataBlockGQL: GetMetadataBlockGQL,
         private datasetByIdGQL: DatasetByIdGQL,
+        private datasetByAccountAndDatasetNameGQL: DatasetByAccountAndDatasetNameGQL,
         private createEmptyDatasetGQL: CreateEmptyDatasetGQL,
         private createDatasetFromSnapshotGQL: CreateDatasetFromSnapshotGQL,
         private commitEventToDataset: CommitEventToDatasetGQL,
@@ -162,17 +166,38 @@ export class DatasetApi {
             );
     }
 
+    public getDatasetInfoByAccountAndDatasetName(
+        accountName: string,
+        datasetName: string,
+    ): Observable<DatasetByAccountAndDatasetNameQuery> {
+        return this.datasetByAccountAndDatasetNameGQL
+            .watch({
+                accountName,
+                datasetName,
+            })
+            .valueChanges.pipe(
+                first(),
+                map(
+                    (
+                        result: ApolloQueryResult<DatasetByAccountAndDatasetNameQuery>,
+                    ) => {
+                        return result.data;
+                    },
+                ),
+            );
+    }
+
     public createDatasetFromSnapshot(
         accountId: string,
         snapshot: string,
-    ): Observable<CreateDatasetFromSnapshotQuery> {
+    ): Observable<CreateDatasetFromSnapshotMutation | undefined | null> {
         return this.createDatasetFromSnapshotGQL
-            .watch({ accountId, snapshot })
-            .valueChanges.pipe(
+            .mutate({ accountId, snapshot })
+            .pipe(
                 first(),
                 map(
                     (
-                        result: ApolloQueryResult<CreateDatasetFromSnapshotQuery>,
+                        result: MutationResult<CreateDatasetFromSnapshotMutation>,
                     ) => {
                         return result.data;
                     },
@@ -184,31 +209,29 @@ export class DatasetApi {
         accountId: string,
         datasetKind: DatasetKind,
         datasetName: string,
-    ): Observable<CreateEmptyDatasetQuery> {
+    ): Observable<CreateEmptyDatasetMutation | null | undefined> {
         return this.createEmptyDatasetGQL
-            .watch({ accountId, datasetKind, datasetName })
-            .valueChanges.pipe(
+            .mutate({ accountId, datasetKind, datasetName })
+            .pipe(
                 first(),
-                map((result: ApolloQueryResult<CreateEmptyDatasetQuery>) => {
+                map((result: MutationResult<CreateEmptyDatasetMutation>) => {
                     return result.data;
                 }),
             );
     }
 
     public commitEvent(params: {
-        accountName: string;
-        datasetName: string;
+        datasetId: string;
         event: string;
-    }): Observable<CommitEventToDatasetQuery> {
+    }): Observable<CommitEventToDatasetMutation | null | undefined> {
         return this.commitEventToDataset
-            .watch({
-                accountName: params.accountName,
-                datasetName: params.datasetName,
+            .mutate({
+                datasetId: params.datasetId,
                 event: params.event,
             })
-            .valueChanges.pipe(
+            .pipe(
                 first(),
-                map((result: ApolloQueryResult<CommitEventToDatasetQuery>) => {
+                map((result: MutationResult<CommitEventToDatasetMutation>) => {
                     return result.data;
                 }),
             );

diff --git a/src/app/api/gql/create-dataset/commit-event.graphql b/src/app/api/gql/create-dataset/commit-event.graphql
@@ -1,10 +1,6 @@
-query commitEventToDataset(
-  $accountName: AccountName!
-  $datasetName: DatasetName!
-  $event: String!
-) {
+mutation commitEventToDataset($datasetId: DatasetID!, $event: String!) {
   datasets {
-    byOwnerAndName(accountName: $accountName, datasetName: $datasetName) {
+    byId(datasetId: $datasetId) {
       metadata {
         chain {
           commitEvent(event: $event, eventFormat: YAML) {

diff --git a/src/app/api/gql/create-dataset/create-empty-dataset.graphql b/src/app/api/gql/create-dataset/create-empty-dataset.graphql
@@ -1,4 +1,4 @@
-query createEmptyDataset(
+mutation createEmptyDataset(
   $accountId: AccountID!
   $datasetKind: DatasetKind!
   $datasetName: DatasetName!

diff --git a/src/app/api/gql/create-dataset/create-from-snapshot.graphql b/src/app/api/gql/create-dataset/create-from-snapshot.graphql
@@ -1,4 +1,4 @@
-query createDatasetFromSnapshot($accountId: AccountID!, $snapshot: String!) {
+mutation createDatasetFromSnapshot($accountId: AccountID!, $snapshot: String!) {
   datasets {
     createFromSnapshot(
       accountId: $accountId

diff --git a/src/app/api/gql/dataset-by-account-and-dataset-name.graphql b/src/app/api/gql/dataset-by-account-and-dataset-name.graphql
@@ -0,0 +1,10 @@
+query datasetByAccountAndDatasetName(
+  $accountName: AccountName!
+  $datasetName: DatasetName!
+) {
+  datasets {
+    byOwnerAndName(accountName: $accountName, datasetName: $datasetName) {
+      ...DatasetBasics
+    }
+  }
+}