From e7e2d3fb843cd81d6eb081014200c9c86e0b42e6 Mon Sep 17 00:00:00 2001 From: Rokas Ramanauskas Date: Thu, 11 Feb 2021 17:51:35 +0200 Subject: [PATCH] refactor: allow specifying document plan id via graphql --- api/resources/schema.graphql | 1 + api/src/api/graphql/translate/document_plan.clj | 5 +++-- api/src/data/entities/document_plan.clj | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/api/resources/schema.graphql b/api/resources/schema.graphql index ada131257..43d40bf1a 100644 --- a/api/resources/schema.graphql +++ b/api/resources/schema.graphql @@ -347,6 +347,7 @@ type Mutation { ): Boolean! createDocumentPlan( + id: ID uid: ID! name: String! kind: String diff --git a/api/src/api/graphql/translate/document_plan.clj b/api/src/api/graphql/translate/document_plan.clj index 372963e60..42c19c2f7 100644 --- a/api/src/api/graphql/translate/document_plan.clj +++ b/api/src/api/graphql/translate/document_plan.clj @@ -2,8 +2,9 @@ (:require [api.utils :refer [read-mapper]] [jsonista.core :as json])) -(defn schema->dp [{:keys [uid name kind blocklyXml documentPlan dataSampleId dataSampleRow]}] - {:uid uid +(defn schema->dp [{:keys [id uid name kind blocklyXml documentPlan dataSampleId dataSampleRow]}] + {:id id + :uid uid :name name :kind kind :blocklyXml blocklyXml diff --git a/api/src/data/entities/document_plan.clj b/api/src/data/entities/document_plan.clj index 460a65a43..a8b25b74a 100644 --- a/api/src/data/entities/document_plan.clj +++ b/api/src/data/entities/document_plan.clj @@ -21,7 +21,7 @@ (db/delete! document-plans-db document-plan-id)) (defn add-document-plan - ([document-plan] (add-document-plan document-plan (utils/gen-rand-str 16))) + ([document-plan] (add-document-plan document-plan (or (:id document-plan) (utils/gen-rand-str 16)))) ([document-plan provided-id] (db/write! document-plans-db provided-id document-plan true)))