👌 Minor changes from PR review

kids-first · Feb 16, 2018 · 62a4dac · 62a4dac
1 parent cfdd266
commit 62a4dac
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/dataservice/api/participant/models.py b/dataservice/api/participant/models.py
@@ -41,4 +41,4 @@ class Participant(db.Model, Base):
                          nullable=False)
 
     def __repr__(self):
-        return '<Participant {}>'.format(self.external_id)
+        return '<Participant {}>'.format(self.kf_id)
diff --git a/dataservice/api/study/models.py b/dataservice/api/study/models.py
@@ -5,23 +5,23 @@
 
 class Study(db.Model, Base):
     """
-    Study entity representing the dbGap study.
+    Study entity representing the dbGaP study.
 
     :param kf_id: Unique id given by the Kid's First DCC
     :param created_at: Time of object creation
     :param modified_at: Last time of object modification
     :param data_access_authority: Name of organization which governs data
     access
-    :param external_id: dbGap accession number
-    :param version: dbGap version
+    :param external_id: dbGaP accession number
+    :param version: dbGaP version
     :param name: Name or title of study
-    :param attribution: Link to attribution prose provided by dbGap
+    :param attribution: Link to attribution prose provided by dbGaP
     """
     __tablename__ = "study"
 
     data_access_authority = db.Column(db.Text(),
                                       nullable=False,
-                                      default='dbGap')
+                                      default='dbGaP')
 
     external_id = db.Column(db.Text(), nullable=False)
     version = db.Column(db.Text())
@@ -33,4 +33,4 @@ class Study(db.Model, Base):
                                    backref='study')
 
     def __repr__(self):
-        return '<Study {}>'.format(self.external_id)
+        return '<Study {}>'.format(self.kf_id)
diff --git a/dataservice/util/data_gen/data_generator.py b/dataservice/util/data_gen/data_generator.py
@@ -24,7 +24,7 @@ def __init__(self, config_name=None):
         if not config_name:
             config_name = os.environ.get('FLASK_CONFIG', 'default')
         self.setup(config_name)
-        self.max_participants = 1
+        self.max_participants = 10
         self._sample_choices()
         self._aliquot_choices()
         self._experiment_choices()

diff --git a/migrations/versions/c23f9043d57b_.py b/migrations/versions/c23f9043d57b_.py
@@ -33,7 +33,6 @@ def upgrade():
     sa.UniqueConstraint('kf_id'),
     sa.UniqueConstraint('uuid')
     )
-    op.create_unique_constraint(None, 'outcome', ['kf_id'])
     op.add_column('participant', sa.Column('study_id', sa.String(length=8), nullable=False))
     op.create_foreign_key(None, 'participant', 'study', ['study_id'], ['kf_id'])
     # ### end Alembic commands ###