Update DB models to be compatible with DB client (#188)

* Update DB models to be compatible with DB client

* Add DB ChallengeOrganizer.v

server/openapi_server/dbmodels/account.py

@@ -1,5 +1,6 @@
+import datetime
 from bson import ObjectId
-from mongoengine import Document, ObjectIdField, StringField
+from mongoengine import Document, ObjectIdField, StringField, IntField, DateTimeField  # noqa: E501
 
 
 class Account(Document):
@@ -9,6 +10,9 @@ class Account(Document):
         required=True,
         choices=["User", "Organization"]
     )
+    createdAt = DateTimeField(required=True, default=datetime.datetime.now)
+    updatedAt = DateTimeField(required=True, default=datetime.datetime.now)
+    v = IntField(db_field='__v')
 
     meta = {'allow_inheritance': True}
 

server/openapi_server/dbmodels/challenge.py

@@ -1,5 +1,7 @@
 from bson import ObjectId
-from mongoengine import DateTimeField, Document, ReferenceField, StringField, ObjectIdField, URLField, ListField  # noqa: E501
+import datetime
+from mongoengine import DateTimeField, Document, ReferenceField, StringField, ObjectIdField, URLField, ListField, IntField  # noqa: E501
+# , ListField
 
 from openapi_server.dbmodels.account import Account
 from openapi_server.dbmodels.challenge_platform import ChallengePlatform
@@ -10,7 +12,7 @@ class Challenge(Document):
     name = StringField(required=True)
     displayName = StringField(min_length=3, max_length=60)
     description = StringField(required=True)
-    fullName = StringField(required=True, unique=True)
+    fullName = StringField()  # TODO restore required=True, unique=True after fixing JSON seed # noqa: E501
     ownerId = ReferenceField(Account)
     websiteUrl = URLField()
     status = StringField(
@@ -22,6 +24,9 @@ class Challenge(Document):
     platformId = ReferenceField(ChallengePlatform)
     topics = ListField(StringField(unique=True), default=[])
     doi = StringField()
+    createdAt = DateTimeField(required=True, default=datetime.datetime.now)
+    updatedAt = DateTimeField(required=True, default=datetime.datetime.now)
+    v = IntField(db_field='__v')
 
     # summary = StringField()
     # startDate = DateTimeField()

server/openapi_server/dbmodels/challenge_organizer.py

@@ -1,6 +1,6 @@
 import datetime
 from bson import ObjectId
-from mongoengine import DateTimeField, Document, ObjectIdField, StringField, ListField, ReferenceField  # noqa: E501
+from mongoengine import DateTimeField, Document, ObjectIdField, StringField, ListField, ReferenceField, IntField  # noqa: E501
 
 from openapi_server.dbmodels.challenge import Challenge
 
@@ -13,6 +13,7 @@ class ChallengeOrganizer(Document):
     challengeId = ReferenceField(Challenge, required=True)
     createdAt = DateTimeField(required=True, default=datetime.datetime.now)
     updatedAt = DateTimeField(required=True, default=datetime.datetime.now)
+    v = IntField(db_field='__v')
 
     def to_dict(self):
         doc = self.to_mongo().to_dict()

server/openapi_server/dbmodels/challenge_platform.py

@@ -1,6 +1,6 @@
 import datetime
 from bson import ObjectId
-from mongoengine import DateTimeField, Document, ObjectIdField, StringField, URLField  # noqa: E501
+from mongoengine import DateTimeField, Document, ObjectIdField, StringField, URLField, IntField  # noqa: E501
 
 
 class ChallengePlatform(Document):
@@ -11,6 +11,7 @@ class ChallengePlatform(Document):
     avatarUrl = URLField()
     createdAt = DateTimeField(required=True, default=datetime.datetime.now)
     updatedAt = DateTimeField(required=True, default=datetime.datetime.now)
+    v = IntField(db_field='__v')
 
     def to_dict(self):
         doc = self.to_mongo().to_dict()

server/openapi_server/dbmodels/challenge_readme.py

@@ -1,6 +1,6 @@
 import datetime
 from bson import ObjectId
-from mongoengine import DateTimeField, Document, ObjectIdField, StringField, ReferenceField  # noqa: E501
+from mongoengine import DateTimeField, Document, ObjectIdField, StringField, ReferenceField, IntField  # noqa: E501
 
 from openapi_server.dbmodels.challenge import Challenge
 
@@ -11,6 +11,7 @@ class ChallengeReadme(Document):
     challengeId = ReferenceField(Challenge, required=True, unique=True)
     createdAt = DateTimeField(required=True, default=datetime.datetime.now)
     updatedAt = DateTimeField(required=True, default=datetime.datetime.now)
+    v = IntField(db_field='__v')
 
     def to_dict(self):
         doc = self.to_mongo().to_dict()

server/openapi_server/dbmodels/org_membership.py

@@ -1,4 +1,5 @@
-from mongoengine import Document, ReferenceField, StringField  # noqa: E501
+import datetime
+from mongoengine import Document, ReferenceField, StringField, IntField, DateTimeField  # noqa: E501
 
 from openapi_server.dbmodels.organization import Organization
 from openapi_server.dbmodels.user import User
@@ -15,6 +16,9 @@ class OrgMembership(Document):
     )
     organizationId = ReferenceField(Organization)
     userId = ReferenceField(User, unique_with='organizationId')
+    createdAt = DateTimeField(required=True, default=datetime.datetime.now)
+    updatedAt = DateTimeField(required=True, default=datetime.datetime.now)
+    v = IntField(db_field='__v')
 
     def to_dict(self):
         doc = self.to_mongo().to_dict()

server/openapi_server/dbmodels/organization.py

@@ -1,5 +1,4 @@
-import datetime
-from mongoengine import DateTimeField, EmailField, StringField, URLField  # noqa: E501
+from mongoengine import EmailField, StringField, URLField  # noqa: E501
 
 from openapi_server.dbmodels.account import Account
 
@@ -10,8 +9,6 @@ class Organization(Account):
     avatarUrl = URLField()
     websiteUrl = URLField()
     description = StringField()
-    createdAt = DateTimeField(required=True, default=datetime.datetime.now)
-    updatedAt = DateTimeField(required=True, default=datetime.datetime.now)
 
     def to_dict(self):
         doc = self.to_mongo().to_dict()

server/openapi_server/dbmodels/user.py

@@ -1,5 +1,4 @@
-import datetime
-from mongoengine import DateTimeField, EmailField, StringField, URLField  # noqa: E501
+from mongoengine import EmailField, StringField, URLField  # noqa: E501
 from werkzeug.security import check_password_hash, generate_password_hash
 
 from openapi_server.dbmodels.account import Account
@@ -10,8 +9,6 @@ class User(Account):
     name = StringField(required=True)
     avatarUrl = URLField()
     bio = StringField()
-    createdAt = DateTimeField(required=True, default=datetime.datetime.now)
-    updatedAt = DateTimeField(required=True, default=datetime.datetime.now)
     passwordHash = StringField(required=True)
 
     def to_dict(self):