From 908cf732960097a672ed8ffe78561722438fbe49 Mon Sep 17 00:00:00 2001
From: Sky Rubenstein <blrubenstein@wpi.edu>
Date: Mon, 12 Aug 2024 12:19:56 -0400
Subject: [PATCH] [DC-1189] Make name and description required for settings
 (#1772)

* Make name and description required for settings

* Fix test data for settings

* Fix integration tests
---
 src/main/resources/api/data-repository-openapi.yaml             | 2 ++
 .../terra/service/snapshotbuilder/SnapshotBuilderTestData.java  | 2 ++
 src/test/resources/omop/settings.json                           | 2 ++
 .../files/OMOPDataset/snapshot_builder_settings.json            | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/src/main/resources/api/data-repository-openapi.yaml b/src/main/resources/api/data-repository-openapi.yaml
index bcf10d1d24..013cc87c59 100644
--- a/src/main/resources/api/data-repository-openapi.yaml
+++ b/src/main/resources/api/data-repository-openapi.yaml
@@ -7244,6 +7244,8 @@ components:
       description: >
         ⚠️ The configuration describing how select criteria for issuing a snapshot builder request is generated
       required:
+        - name
+        - description
         - domainOptions
         - programDataOptions
         - featureValueGroups
diff --git a/src/test/java/bio/terra/service/snapshotbuilder/SnapshotBuilderTestData.java b/src/test/java/bio/terra/service/snapshotbuilder/SnapshotBuilderTestData.java
index 37f1cce51a..1ce91425ee 100644
--- a/src/test/java/bio/terra/service/snapshotbuilder/SnapshotBuilderTestData.java
+++ b/src/test/java/bio/terra/service/snapshotbuilder/SnapshotBuilderTestData.java
@@ -100,6 +100,8 @@ private static SnapshotBuilderProgramDataListOption generateSnapshotBuilderProgr
 
   public static final SnapshotBuilderSettings SETTINGS =
       new SnapshotBuilderSettings()
+          .name("Snapshot builder settings name")
+          .description("Snapshot builder settings description")
           .domainOptions(
               List.of(
                   generateSnapshotBuilderDomainOption(
diff --git a/src/test/resources/omop/settings.json b/src/test/resources/omop/settings.json
index 8a3c187c95..2cde4e48ca 100644
--- a/src/test/resources/omop/settings.json
+++ b/src/test/resources/omop/settings.json
@@ -1,4 +1,6 @@
 {
+  "name": "Integration test settings",
+  "description": "Description for integration test settings",
   "domainOptions": [
     {
       "kind": "domain",
diff --git a/tools/setupResourceScripts/files/OMOPDataset/snapshot_builder_settings.json b/tools/setupResourceScripts/files/OMOPDataset/snapshot_builder_settings.json
index 8a3c187c95..42e5ab8668 100644
--- a/tools/setupResourceScripts/files/OMOPDataset/snapshot_builder_settings.json
+++ b/tools/setupResourceScripts/files/OMOPDataset/snapshot_builder_settings.json
@@ -1,4 +1,6 @@
 {
+  "name": "Generated snapshot builder dataset",
+  "description": "A generic OMOP dataset generated by the TDR Setup Resources Script",
   "domainOptions": [
     {
       "kind": "domain",