Start on data model changes and API changes for the new repository notification system

data/database.py

@@ -187,12 +187,6 @@ class PermissionPrototype(BaseModel):
     )
 
 
-class Webhook(BaseModel):
-  public_id = CharField(default=random_string_generator(length=64),
-                        unique=True, index=True)
-  repository = ForeignKeyField(Repository)
-  parameters = TextField()
-
 
 class AccessToken(BaseModel):
   friendly_name = CharField(null=True)
@@ -371,9 +365,35 @@ class Notification(BaseModel):
   created = DateTimeField(default=datetime.now, index=True)
 
 
+
+class ExternalNotificationEvent(BaseModel):
+  name = CharField(index=True, unique=True)
+
+
+class ExternalNotificationMethod(BaseModel):
+  name = CharField(index=True, unique=True)
+
+
+class RepositoryNotification(BaseModel):
+  uuid = CharField(default=uuid_generator, index=True)
+  repository = ForeignKeyField(Repository, index=True)
+  event = ForeignKeyField(ExternalNotificationEvent)
+  method = ForeignKeyField(ExternalNotificationMethod)
+  config_json = TextField()
+
+
+# TODO: remove after migration.
+class Webhook(BaseModel):
+  public_id = CharField(default=random_string_generator(length=64),
+                        unique=True, index=True)
+  repository = ForeignKeyField(Repository)
+  parameters = TextField()
+
+
 all_models = [User, Repository, Image, AccessToken, Role, RepositoryPermission, Visibility,
               RepositoryTag, EmailConfirmation, FederatedLogin, LoginService, QueueItem,
-              RepositoryBuild, Team, TeamMember, TeamRole, Webhook, LogEntryKind, LogEntry,
+              RepositoryBuild, Team, TeamMember, TeamRole, LogEntryKind, LogEntry,
               PermissionPrototype, ImageStorage, BuildTriggerService, RepositoryBuildTrigger,
               OAuthApplication, OAuthAuthorizationCode, OAuthAccessToken, NotificationKind,
-              Notification, ImageStorageLocation, ImageStoragePlacement]
+              Notification, ImageStorageLocation, ImageStoragePlacement,
+              ExternalNotificationEvent, ExternalNotificationMethod, RepositoryNotification, Webhook]

data/model/legacy.py

@@ -60,6 +60,10 @@ class InvalidWebhookException(DataModelException):
   pass
 
 
+class InvalidNotificationException(DataModelException):
+  pass
+
+
 class InvalidBuildTriggerException(DataModelException):
   pass
 
@@ -1528,6 +1532,39 @@ def get_pull_credentials(robotname):
   }
 
 
+def create_repo_notification(repo, event_name, method_name, config):
+  event = ExternalNotificationEvent.get(ExternalNotificationEvent.name == event_name)
+  method = ExternalNotificationMethod.get(ExternalNotificationMethod.name == method_name)
+
+  return RepositoryNotification.create(repository=repo, event=event, method=method,
+                                       confing_json=json.dumps(config))
+
+
+def get_repo_notification(namespace_name, repository_name, uuid):
+  joined = RepositoryNotification.select().join(Repository)
+  found = list(joined.where(Repository.namespace == namespace_name,
+                            Repository.name == repository_name,
+                            RepositoryNotification.uuid == uuid))
+
+  if not found:
+    raise InvalidNotificationException('No repository notification found with id: %s' % uuid)
+
+  return found[0]
+
+
+def delete_repo_notification(namespace_name, repository_name, uuid):
+  found = get_repo_notification(namespace_name, repository_name, uuid)
+  found.delete_instance()
+  return found
+
+
+def list_repo_notifications(namespace_name, repository_name):
+  joined = RepositoryNotification.select().join(Repository)
+  return joined.where(Repository.namespace == namespace_name,
+                      Repository.name == repository_name)
+
+
+# TODO: remove webhook methods when no longer used.
 def create_webhook(repo, params_obj):
   return Webhook.create(repository=repo, parameters=json.dumps(params_obj))