merge changes for issue #94

Author: Ulrich-F

backend/app/cp/domains.py

@@ -42,17 +42,21 @@ def get_cp_domain(domain_id):
         SHOULD NOT be repeated.
     :status 404: Not found
     """
-    domain = Domain.query.get_or_404(domain_id)
+    domain = Domain.query.get(domain_id)
     if not domain:
         abort(404)
 
-    #org = Organization.get(domain.organization_id)
     org = domain.organization
     if not org:
         abort(404)
     if not g.user.may_handle_organization(org):
         abort(401)
-    return ApiResponse(domain.serialize())
+
+    #serialize() kills keys where value == 0
+    domain_serialized = domain.serialize()
+    if domain.notification_interval == 0:
+        domain_serialized['notification_interval'] = 0
+    return ApiResponse(domain_serialized)
 
 
 @cp.route('/domains', methods=['POST'])

backend/app/models.py

@@ -2102,7 +2102,7 @@ def load_user(user_id):
 
 class Domain(Model, SerializerMixin):
     __tablename__ = 'domains'
-    __public__ = ('id', 'organization_id', 'domain_name')
+    __public__ = ('id', 'organization_id', 'domain_name', 'delivery_protocol', 'delivery_format', 'notification_interval')
     __table_args__ = (
             db.UniqueConstraint('organization_id', 'domain_name'),
     )
@@ -2112,6 +2112,9 @@ class Domain(Model, SerializerMixin):
     _domain_name = db.Column('domain_name', db.String(255), nullable=False)
     organization_id = db.Column(db.Integer, db.ForeignKey('organizations.id', ondelete="CASCADE"), nullable=False)
     organization = db.relationship('Organization', back_populates='domains')
+    delivery_protocol = db.Column(db.Enum('Mail', 'REST API', 'AMQP', name='delivery_protocol_enum'), default='Mail')
+    delivery_format = db.Column(db.Enum('CSV', 'JSON', name='delivery_format_enum'), default='CSV')
+    notification_interval = db.Column(db.Integer, default=0)
 
     @property
     def domain_name(self):

backend/misc/migrations/versions/4f34c9a337ca_.py

@@ -0,0 +1,30 @@
+"""empty message
+
+Revision ID: 4f34c9a337ca
+Revises: None
+Create Date: 2020-07-24 15:04:52.900526
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '4f34c9a337ca'
+down_revision = None
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('domains', sa.Column('delivery_format', sa.Enum('CSV', 'JSON', name='delivery_format_enum'), nullable=True))
+    op.add_column('domains', sa.Column('delivery_protocol', sa.Enum('Mail', 'REST API', 'AMQP', name='delivery_protocol_enum'), nullable=True))
+    op.add_column('domains', sa.Column('notification_interval', sa.Integer(), nullable=True))
+    ### end Alembic commands ###
+
+
+def downgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('domains', 'notification_interval')
+    op.drop_column('domains', 'delivery_protocol')
+    op.drop_column('domains', 'delivery_format')
+    ### end Alembic commands ###

backend/tests/test_cp_domains.py

@@ -384,7 +384,7 @@ def test_get_domain(client):
         url_for('cp.get_cp_domain', domain_id=domain.id),
     )
     assert rv.status_code == 200
-    expectedkeys = ['id', 'domain_name', 'organization_id']
+    expectedkeys = ['id', 'domain_name', 'organization_id', 'delivery_protocol', 'delivery_format', 'notification_interval']
     expectedkeys.sort()
     gotkeys = list(rv.json.keys())
     gotkeys.sort()

backend/tests/test_domains.py

@@ -14,6 +14,7 @@ class TDS:
     domain1 = 'domain1.at'
     domain2 = 'domain2.at'
     domainwrong = ' '
+    domainwrongenum = 'domain.wrong.enum.at'
 
     @staticmethod
     def getOrganization(orgname):
@@ -77,7 +78,7 @@ def test_create_wrong_domain(client):
         db.session.rollback()
         exception_occured = True
 
-    assert exception_occured or newdomain, 'wrong domain created'
+    assert exception_occured, 'wrong domain created'
 
     domain = Domain.query.filter_by(_domain_name=TDS.domainwrong).first()
     assert not domain, 'wrong domain created'
@@ -125,3 +126,31 @@ def test_delete_domain(client):
     domain = org.domains.first()
     assert not domain, 'domain deleted but found by organization.'
 
+
+def test_create_domain_wrong_enum(client):
+    org = TDS.getOrganization(TDS.org1)
+    assert org, 'test broken. organization not found'
+
+    exception_occured = False
+    try:
+       newdomain = Domain(domain_name=TDS.domainwrongenum, organization=org, delivery_protocol='xyz')
+       db.session.add(newdomain)
+       db.session.commit()
+    except:
+        db.session.rollback()
+        exception_occured = True
+    assert exception_occured, 'domain created with wrong enum.'
+
+    exception_occured = False
+    try:
+       newdomain = Domain(domain_name=TDS.domainwrongenum, organization=org, delivery_format='xyz')
+       db.session.add(newdomain)
+       db.session.commit()
+    except:
+        db.session.rollback()
+        exception_occured = True
+    assert exception_occured, 'domain created with wrong enum.'
+
+    domain = Domain.query.filter_by(_domain_name=TDS.domainwrongenum).first()
+    assert not domain, 'domain created with wrong enum, found by domain_name.'
+

frontend/app/views/domain-create.html

@@ -25,6 +25,33 @@ <h3 class="panel-title">"New Domain"</h3>
                  ng-model="domain.domain_name">
         </div>
       </div>
+
+       <div class="row show-grid">
+        <div class="col-xs-2">Protocol</div>
+        <div class="col-xs-10">
+          <select class="form-control input-sm" required ng-model="domain.delivery_protocol">
+            <option ng-repeat="proto in ['Mail', 'REST API', 'AMQP']" ng-checked="proto === domain.delivery_protocol" value="{{proto}}">{{proto}}</option>
+          </select>
+        </div>
+      </div>
+
+      <div class="row show-grid">
+        <div class="col-xs-2">Format</div>
+        <div class="col-xs-10">
+          <select class="form-control input-sm" required ng-model="domain.delivery_format">
+            <option ng-repeat="format in ['CSV', 'JSON']" ng-checked="format === domain.delivery_format" value="{{format}}">{{format}}</option>
+          </select>
+        </div>
+      </div>
+
+      <div class="row show-grid">
+        <div class="col-xs-2">Interval [s]</div>
+        <div class="col-xs-10">
+          <div class="col-xs-2">
+            <input class="form-control input-sm" required ng-model="domain.notification_interval">
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 

frontend/app/views/organization-edit.html

@@ -134,14 +134,34 @@ <h3 class="panel-title">Associated Domains</h3>
   <div class="panel-body">
     <div class="row show-grid">
       <div class="col-xs-2"><strong>Domain name</strong></div>
+      <div class="col-xs-2"><strong>Protocol</strong></div>
+      <div class="col-xs-2"><strong>Format</strong></div>
+      <div class="col-xs-2"><strong>Interval [s]</strong></div>
     </div>
     <div ng-repeat="domain in domains">
       <div class="row show-grid">
         <div ng-if="!(edit && domain.dirty)">
           <div class="col-xs-2">{{domain.domain_name}}</div>
+          <div class="col-xs-2">{{domain.delivery_protocol}}</div>
+          <div class="col-xs-2">{{domain.delivery_format}}</div>
+          <div class="col-xs-2">{{domain.notification_interval}}</div>
         </div>
         <div ng-if="edit && domain.dirty">
           <div class="col-xs-2"><input class="form-control input-sm" required ng-model="domain.domain_name"></div>
+          <div class="col-xs-2">
+            <select class="form-control input-sm" required ng-model="domain.delivery_protocol">
+              <option ng-repeat="proto in ['Mail', 'REST API', 'AMQP']" ng-checked="proto === domain.delivery_protocol" value="{{proto}}">{{proto}}</option>
+            </select>
+          </div>
+          <div class="col-xs-2">
+            <select class="form-control input-sm" required ng-model="domain.delivery_format">
+              <option ng-repeat="format in ['CSV', 'JSON']" ng-checked="format === domain.delivery_format" value="{{format}}">{{format}}</option>
+            </select>
+          </div>
+          <div class="col-xs-2">
+            <input class="form-control input-sm" required ng-model="domain.notification_interval">
+          </div>
+
           <div class="col-xs-2">
             <button class="btn btn-default btn-sm" ng-click="update_domain(domain)">
               <span class="glyphicon glyphicon-floppy-disk" aria-hidden="true"></span>