From cee4851a594371ee90a248ecb255e443274b5f87 Mon Sep 17 00:00:00 2001
From: alexbainter <alexbainter@gmail.com>
Date: Mon, 19 Jan 2026 13:32:30 -0600
Subject: [PATCH 1/4] Add Organization and Profile models

---
 core/admin.py                                | 17 +++++-
 core/apps.py                                 |  3 ++
 core/migrations/0009_organization_profile.py | 56 ++++++++++++++++++++
 core/models.py                               | 15 ++++++
 core/signals.py                              | 13 +++++
 5 files changed, 103 insertions(+), 1 deletion(-)
 create mode 100644 core/migrations/0009_organization_profile.py
 create mode 100644 core/signals.py

diff --git a/core/admin.py b/core/admin.py
index 457fdca..ef51d0f 100644
--- a/core/admin.py
+++ b/core/admin.py
@@ -1,6 +1,12 @@
 from django.contrib import admin
 from django.contrib.admin.decorators import register
-from .models import Schema, SchemaRef, DocumentationItem
+from .models import (
+    Schema,
+    SchemaRef,
+    DocumentationItem,
+    Organization,
+    Profile
+)
 
 
 @register(Schema)
@@ -17,3 +23,12 @@ class SchemaRefAdmin(admin.ModelAdmin):
 class DocumentationItemAdmin(admin.ModelAdmin):
     list_display = ['schema', 'name', 'url']
 
+
+@register(Organization)
+class OrganizationAdmin(admin.ModelAdmin):
+    list_display = ['name', 'slug']
+
+
+@register(Profile)
+class ProfileAdmin(admin.ModelAdmin):
+    list_display = ['user', 'organization']
diff --git a/core/apps.py b/core/apps.py
index 8115ae6..da7b127 100644
--- a/core/apps.py
+++ b/core/apps.py
@@ -4,3 +4,6 @@
 class CoreConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'core'
+
+    def ready(self):
+        import core.signals
diff --git a/core/migrations/0009_organization_profile.py b/core/migrations/0009_organization_profile.py
new file mode 100644
index 0000000..8467e57
--- /dev/null
+++ b/core/migrations/0009_organization_profile.py
@@ -0,0 +1,56 @@
+# Generated by Django 5.2.5 on 2026-01-21 17:08
+# Edited to create Profiles for existing users
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+def create_profiles(apps, schema_editor):
+    User = apps.get_model("auth", "User")
+    Profile = apps.get_model("core", "Profile")
+
+    profiles = []
+    for user in User.objects.all():
+        profiles.append(Profile(user=user))
+
+    Profile.objects.bulk_create(profiles, ignore_conflicts=True)
+
+
+def remove_profiles(apps, schema_editor):
+    Profile = apps.get_model("core", "Profile")
+    Profile.objects.all().delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0008_alter_documentationitem_format_and_more'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Organization',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('name', models.CharField(max_length=200)),
+                ('slug', models.SlugField(unique=True)),
+                ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.RESTRICT, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='Profile',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('organization', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='core.organization')),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.RunPython(create_profiles, remove_profiles)
+    ]
diff --git a/core/models.py b/core/models.py
index cd6e605..da8ab7b 100644
--- a/core/models.py
+++ b/core/models.py
@@ -3,6 +3,7 @@
 from django.db.models import Q
 from django.contrib.auth.models import User
 from django.utils import timezone
+from django.conf import settings
 from urllib.parse import urlparse
 import requests
 from .utils import guess_specification_language_by_extension, guess_language_by_extension
@@ -207,6 +208,7 @@ def repo_url(self):
         normal_path = "/".join([user, repo, "blob", branch] + filepath)
         return f"https://{self.REPO_NETLOC}/{normal_path}"
 
+
 class ReferenceItem(BaseModel):
     class Meta:
         abstract = True
@@ -272,3 +274,16 @@ def __str__(self):
     def language(self):
         return guess_language_by_extension(self.url, ['markdown'])
 
+
+class Organization(BaseModel):
+    name = models.CharField(max_length=200)
+    slug = models.SlugField(unique=True)
+
+    def __str__(self):
+        return self.name
+
+
+class Profile(models.Model):
+    user = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
+    organization = models.ForeignKey(Organization, blank=True, null=True, on_delete=models.SET_NULL)
+
diff --git a/core/signals.py b/core/signals.py
new file mode 100644
index 0000000..aa2e6d8
--- /dev/null
+++ b/core/signals.py
@@ -0,0 +1,13 @@
+from django.conf import settings
+from django.db.models.signals import post_save
+from django.dispatch import receiver
+
+from .models import Profile
+
+User = settings.AUTH_USER_MODEL
+
+@receiver(post_save, sender=User)
+def create_user_profile(sender, instance, created, **kwargs):
+    if created:
+        Profile.objects.create(user=instance)
+

From 9cfec8f36b9752bbfbf848e913c2b434f71060f0 Mon Sep 17 00:00:00 2001
From: alexbainter <alexbainter@gmail.com>
Date: Mon, 19 Jan 2026 13:34:13 -0600
Subject: [PATCH 2/4] Add organization detail page

---
 core/models.py                                |  6 +++++
 core/static/css/site.css                      |  9 +++++++
 core/templates/core/organizations/detail.html | 26 +++++++++++++++++++
 core/urls.py                                  |  3 ++-
 core/views.py                                 | 10 ++++++-
 5 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 core/templates/core/organizations/detail.html

diff --git a/core/models.py b/core/models.py
index da8ab7b..efc9225 100644
--- a/core/models.py
+++ b/core/models.py
@@ -282,6 +282,12 @@ class Organization(BaseModel):
     def __str__(self):
         return self.name
 
+    @property
+    def public_schemas(self):
+        return Schema.public_objects.filter(
+            created_by_id__in=self.profile_set.values_list("user_id", flat=True)
+        )
+
 
 class Profile(models.Model):
     user = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
diff --git a/core/static/css/site.css b/core/static/css/site.css
index 7ef790c..0389aae 100644
--- a/core/static/css/site.css
+++ b/core/static/css/site.css
@@ -904,3 +904,12 @@ a.badge--w3c {
   padding: 1rem;
   gap: 1rem;
 }
+
+/* Organization detail */
+.organization-detail {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 1rem;
+  gap: 1rem;
+}
diff --git a/core/templates/core/organizations/detail.html b/core/templates/core/organizations/detail.html
new file mode 100644
index 0000000..3e2445c
--- /dev/null
+++ b/core/templates/core/organizations/detail.html
@@ -0,0 +1,26 @@
+{% extends "core/layouts/base.html" %}
+{% block head_title %}
+{{ organization.name }} | Schemas.Pub 
+{% endblock %}
+
+{% block page_content %}
+<main class="organization-detail">
+  <h1>{{ organization.name }}</h1>
+  <div class="main-content">
+    {% if organization.public_schemas.count %}
+    <h2>Schema{{ organization.public_schemas.count|pluralize }}</h2>
+    <ul>
+      {% for schema in organization.public_schemas.all %}
+      <li>
+        <a href="{% url 'schema_detail' schema_id=schema.id %}">
+          {{ schema.name }}
+        </a>
+      </li>
+      {% endfor %}
+    </ul>
+    {% else %}
+    <p>This organization has no schemas.</p>
+    {% endif %}
+  </div>
+</main>
+{% endblock %}
diff --git a/core/urls.py b/core/urls.py
index 225a167..5b27f98 100644
--- a/core/urls.py
+++ b/core/urls.py
@@ -11,6 +11,7 @@
     path("manage/schema/<int:schema_id>", views.manage_schema, name="manage_schema"),
     path("manage/schema/new", views.manage_schema, name="manage_schema_new"),
     path("manage/schema/<int:schema_id>/delete", views.manage_schema_delete, name="manage_schema_delete"),
-    path("manage/schema/<int:schema_id>/publish", views.manage_schema_publish, name="manage_schema_publish")
+    path("manage/schema/<int:schema_id>/publish", views.manage_schema_publish, name="manage_schema_publish"),
+    path("organization/<int:organization_id>", views.organization_detail, name="organization_detail")
 ]
 
diff --git a/core/views.py b/core/views.py
index a0cc241..9085bfe 100644
--- a/core/views.py
+++ b/core/views.py
@@ -13,7 +13,8 @@
 from .models import (Schema,
                      DocumentationItem,
                      SchemaRef,
-                     DocumentationItem)
+                     DocumentationItem,
+                     Organization)
 from .forms import SchemaForm, DocumentationItemForm
 
 
@@ -301,3 +302,10 @@ def manage_schema_publish(request, schema_id):
 
 def about(request):
     return render(request, "core/about.html")
+
+
+def organization_detail(request, organization_id):
+    organization = get_object_or_404(Organization, id=organization_id)
+    return render(request, "core/organizations/detail.html", {
+        'organization': organization,
+    })

From 15810d068268205503f4efcb08311a6b6b6769a1 Mon Sep 17 00:00:00 2001
From: alexbainter <alexbainter@gmail.com>
Date: Mon, 19 Jan 2026 13:34:31 -0600
Subject: [PATCH 3/4] List a user's organization on their profile page

---
 core/templates/account/profile.html | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/core/templates/account/profile.html b/core/templates/account/profile.html
index 15da98b..deb4229 100644
--- a/core/templates/account/profile.html
+++ b/core/templates/account/profile.html
@@ -44,6 +44,18 @@ <h1>My Schemas</h1>
     {% endif %}
     <a href="{% url 'manage_schema_new' %}" class="button button--prominent">Add schema</a>
   </section>
+  {% if request.user.profile.organization %}
+  <section class="text--secondary">
+    <h1>Organization</h1>
+    <ul>
+      <li>
+        <a href="{% url 'organization_detail' organization_id=request.user.profile.organization.id %}">
+          {{ request.user.profile.organization.name }}
+        </a>
+      </li>
+    </ul>
+  </section>
+  {% endif %}
   <section class="text--secondary">
     <h1>Account</h1>
     Email: {{ request.user.email }}

From ee5251ba6595a5e3d6795f96990a01f7ae64d298 Mon Sep 17 00:00:00 2001
From: alexbainter <alexbainter@gmail.com>
Date: Mon, 19 Jan 2026 13:35:13 -0600
Subject: [PATCH 4/4] List the managing organization on the schema detail page

---
 core/models.py                          |  4 ++++
 core/templates/core/schemas/layout.html | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/core/models.py b/core/models.py
index efc9225..f49dc52 100644
--- a/core/models.py
+++ b/core/models.py
@@ -59,6 +59,10 @@ def url_providers(self):
         }
         return provider_names
 
+    @property
+    def organization(self):
+        return self.created_by.profile.organization
+
     def _latest_documentation_item_of_type(self, role):
         return self.documentationitem_set.filter(role=role).order_by('-created_at').first()
 
diff --git a/core/templates/core/schemas/layout.html b/core/templates/core/schemas/layout.html
index 85c4b2a..f07b065 100644
--- a/core/templates/core/schemas/layout.html
+++ b/core/templates/core/schemas/layout.html
@@ -25,7 +25,15 @@ <h1>
     <div class="header__info">
       <span>Added on {{ schema.created_at | date }}</span>
       &bull;
-      <span>Managed by {{ schema.created_by }}</span>
+      <span>Managed by 
+        {% if schema.organization %}
+        <a href="{% url 'organization_detail' organization_id=schema.organization.id %}">
+          {{ schema.organization.name }}
+        </a>
+        {% else %}
+        {{ schema.created_by }}
+        {% endif %}
+      </span>
     </div>
   </div>
   <nav class="schema-layout__nav">