Merge ~pappacena/launchpad:official-oci-recipe into launchpad:master

[Thiago F. Pappacena]

Adding picker to select, on OCI project edit page, which recipe is the official one.

[Ioana Lasc (ilasc)]

This looks to me like it has all the right elements but I would wait for a second review.

[Colin Watson (cjwatson)]

review: Needs Fixing

[Thiago F. Pappacena (pappacena)]

It should be good now for another round of review, cjwatson.

[Colin Watson (cjwatson)]

review: Approve

[Thiago F. Pappacena (pappacena)]

I've made the requested changes, but we cannot remove IOCIRecipe._official attribute (it allows OCIProject.setOfficialRecipe to change the recipe's value).

[Otto Co-Pilot (otto-copilot)]

Merging failed
https://jenkins.ols.canonical.com/online-services/job/launchpad/415/

2e68221... by Thiago F. Pappacena on 2020-05-14

Merge branch 'master' into official-oci-recipe

diff --git a/lib/lp/oci/interfaces/ocirecipe.py b/lib/lp/oci/interfaces/ocirecipe.py
index 3163f0f..4b2b06d 100644
--- a/lib/lp/oci/interfaces/ocirecipe.py
+++ b/lib/lp/oci/interfaces/ocirecipe.py
@@ -200,6 +200,13 @@ class IOCIRecipeView(Interface):
         "The architectures that are available to be enabled or disabled for "
         "this OCI recipe.")
 
+    # This should only be set by using IOCIProject.setOfficialRecipe
+    official = Bool(
+        title=_("OCI project official"),
+        required=False,
+        description=_("True if this recipe is official for its OCI project."),
+        readonly=True)
+
     @call_with(check_permissions=True, user=REQUEST_USER)
     @operation_parameters(
         processors=List(
@@ -340,13 +347,6 @@ class IOCIRecipeEditableAttributes(IHasOwner):
         required=True,
         readonly=True))
 
-    official = Bool(
-        title=_("OCI project official"),
-        required=True,
-        default=False,
-        description=_("True if this recipe is official for its OCI project."),
-        readonly=False)
-
     git_ref = exported(Reference(
         IGitRef, title=_("Git branch"), required=True, readonly=False,
         description=_(
diff --git a/lib/lp/oci/model/ocirecipe.py b/lib/lp/oci/model/ocirecipe.py
index f894e7a..8562778 100644
--- a/lib/lp/oci/model/ocirecipe.py
+++ b/lib/lp/oci/model/ocirecipe.py
@@ -130,7 +130,9 @@ class OCIRecipe(Storm, WebhookTargetMixin):
     name = Unicode(name="name", allow_none=False)
     description = Unicode(name="description", allow_none=True)
 
-    official = Bool(name="official", default=False)
+    # OCIRecipe.official shouldn't be set directly. Instead, call
+    # oci_project.setOfficialRecipe method.
+    _official = Bool(name="official", default=False)
 
     git_repository_id = Int(name="git_repository", allow_none=True)
     git_repository = Reference(git_repository_id, "GitRepository.id")
@@ -154,7 +156,7 @@ class OCIRecipe(Storm, WebhookTargetMixin):
         self.oci_project = oci_project
         self.description = description
         self.build_file = build_file
-        self.official = official
+        self._official = official
         self.require_virtualized = require_virtualized
         self.build_daily = build_daily
         self.date_created = date_created
@@ -165,6 +167,11 @@ class OCIRecipe(Storm, WebhookTargetMixin):
     def valid_webhook_event_types(self):
         return ["oci-recipe:build:0.1"]
 
+    @property
+    def official(self):
+        """See `IOCIProject.setOfficialRecipe` method."""
+        return self._official
+
     def destroySelf(self):
         """See `IOCIRecipe`."""
         # XXX twom 2019-11-26 This needs to expand as more build artifacts
diff --git a/lib/lp/oci/tests/test_ocirecipe.py b/lib/lp/oci/tests/test_ocirecipe.py
index fac8638..74d15e0 100644
--- a/lib/lp/oci/tests/test_ocirecipe.py
+++ b/lib/lp/oci/tests/test_ocirecipe.py
@@ -24,6 +24,10 @@ from testtools.matchers import (
     )
 import transaction
 from zope.component import getUtility
+from zope.security.interfaces import (
+    ForbiddenAttribute,
+    Unauthorized,
+    )
 from zope.security.proxy import removeSecurityProxy
 
 from lp.buildmaster.enums import BuildStatus
@@ -61,7 +65,10 @@ from lp.services.webhooks.testing import LogsScheduledWebhooks
 from lp.testing import (
     admin_logged_in,
     api_url,
+    login_admin,
+    login_person,
     person_logged_in,
+    StormStatementRecorder,
     TestCaseWithFactory,
     )
 from lp.testing.dbuser import dbuser
@@ -441,6 +448,151 @@ class TestOCIRecipe(OCIConfigHelperMixin, TestCaseWithFactory):
                 recipe.newPushRule,
                 recipe.owner, url, image_name, credentials)
 
+    def test_set_official_directly_is_forbidden(self):
+        recipe = self.factory.makeOCIRecipe()
+        self.assertRaises(
+            ForbiddenAttribute, setattr, recipe, 'official', True)
+
+    def test_set_recipe_as_official_for_oci_project(self):
+        distro = self.factory.makeDistribution()
+        owner = distro.owner
+        login_person(owner)
+        oci_project1 = self.factory.makeOCIProject(
+            registrant=owner, pillar=distro)
+        oci_project2 = self.factory.makeOCIProject(
+            registrant=owner, pillar=distro)
+
+        oci_proj1_recipes = [
+            self.factory.makeOCIRecipe(
+                oci_project=oci_project1, registrant=owner, owner=owner)
+            for _ in range(3)]
+
+        # Recipes for project 2
+        oci_proj2_recipes = [
+            self.factory.makeOCIRecipe(
+                oci_project=oci_project2, registrant=owner, owner=owner)
+            for _ in range(2)]
+
+        self.assertIsNone(oci_project1.getOfficialRecipe())
+        self.assertIsNone(oci_project2.getOfficialRecipe())
+        for recipe in oci_proj1_recipes + oci_proj2_recipes:
+            self.assertFalse(recipe.official)
+
+        # Set official for project1 and make sure nothing else got changed.
+        with StormStatementRecorder() as recorder:
+            oci_project1.setOfficialRecipe(oci_proj1_recipes[0])
+            self.assertEqual(2, recorder.count)
+
+        self.assertIsNone(oci_project2.getOfficialRecipe())
+        self.assertEqual(
+            oci_proj1_recipes[0], oci_project1.getOfficialRecipe())
+        self.assertTrue(oci_proj1_recipes[0].official)
+        for recipe in oci_proj1_recipes[1:] + oci_proj2_recipes:
+            self.assertFalse(recipe.official)
+
+        # Set back no recipe as official.
+        with StormStatementRecorder() as recorder:
+            oci_project1.setOfficialRecipe(None)
+            self.assertEqual(1, recorder.count)
+
+        for recipe in oci_proj1_recipes + oci_proj2_recipes:
+            self.assertFalse(recipe.official)
+
+    def test_set_recipe_as_official_for_wrong_oci_project(self):
+        distro = self.factory.makeDistribution()
+        owner = distro.owner
+        login_person(owner)
+        oci_project = self.factory.makeOCIProject(
+            registrant=owner, pillar=distro)
+        another_oci_project = self.factory.makeOCIProject(
+            registrant=owner, pillar=distro)
+
+        recipe = self.factory.makeOCIRecipe(
+            oci_project=oci_project, registrant=owner)
+
+        self.assertRaises(
+            ValueError, another_oci_project.setOfficialRecipe, recipe)
+
+    def test_permission_check_on_setOfficialRecipe(self):
+        distro = self.factory.makeDistribution()
+        owner = distro.owner
+        login_person(owner)
+        oci_project = self.factory.makeOCIProject(
+            registrant=owner, pillar=distro)
+
+        another_user = self.factory.makePerson()
+        with person_logged_in(another_user):
+            self.assertRaises(
+                Unauthorized, getattr, oci_project, 'setOfficialRecipe')
+
+    def test_oci_project_get_recipe_by_name_and_owner(self):
+        owner = self.factory.makePerson()
+        login_person(owner)
+        oci_project = self.factory.makeOCIProject(registrant=owner)
+
+        recipe = self.factory.makeOCIRecipe(
+            oci_project=oci_project, registrant=owner, owner=owner,
+            name="foo-recipe")
+
+        self.assertEqual(
+            recipe,
+            oci_project.getRecipeByNameAndOwner(recipe.name, owner.name))
+        self.assertIsNone(
+            oci_project.getRecipeByNameAndOwner(recipe.name, "someone"))
+        self.assertIsNone(
+            oci_project.getRecipeByNameAndOwner("some-recipe", owner.name))
+
+    def test_search_recipe_from_oci_project(self):
+        owner = self.factory.makePerson()
+        login_person(owner)
+        oci_project = self.factory.makeOCIProject(registrant=owner)
+        another_oci_project = self.factory.makeOCIProject(registrant=owner)
+
+        recipe1 = self.factory.makeOCIRecipe(
+            name="a something", oci_project=oci_project, registrant=owner)
+        recipe2 = self.factory.makeOCIRecipe(
+            name="banana", oci_project=oci_project, registrant=owner)
+        # Recipe from another project.
+        self.factory.makeOCIRecipe(
+            name="something too", oci_project=another_oci_project,
+            registrant=owner)
+
+        self.assertEqual([recipe1], list(oci_project.searchRecipes("somet")))
+        self.assertEqual([recipe2], list(oci_project.searchRecipes("bana")))
+        self.assertEqual([], list(oci_project.searchRecipes("foo")))
+
+    def test_search_recipe_from_oci_project_is_ordered(self):
+        login_admin()
+        team = self.factory.makeTeam()
+        owner1 = self.factory.makePerson(name="a-user")
+        owner2 = self.factory.makePerson(name="b-user")
+        owner3 = self.factory.makePerson(name="foo-person")
+        team.addMember(owner1, team)
+        team.addMember(owner2, team)
+        team.addMember(owner3, team)
+
+        distro = self.factory.makeDistribution(oci_project_admin=team)
+        oci_project = self.factory.makeOCIProject(
+            registrant=team, pillar=distro)
+        recipe1 = self.factory.makeOCIRecipe(
+            name="same-name", oci_project=oci_project,
+            registrant=owner1, owner=owner1)
+        recipe2 = self.factory.makeOCIRecipe(
+            name="same-name", oci_project=oci_project,
+            registrant=owner2, owner=owner2)
+        recipe3 = self.factory.makeOCIRecipe(
+            name="a-first", oci_project=oci_project,
+            registrant=owner1, owner=owner1)
+        # This one should be filtered out.
+        self.factory.makeOCIRecipe(
+            name="xxx", oci_project=oci_project,
+            registrant=owner3, owner=owner3)
+
+        # It should be sorted by owner's name first, then recipe name.
+        self.assertEqual(
+            [recipe3, recipe1, recipe2],
+            list(oci_project.searchRecipes(u"a")))
+
 
 class TestOCIRecipeProcessors(TestCaseWithFactory):
 
@@ -955,7 +1107,7 @@ class TestOCIRecipeWebservice(OCIConfigHelperMixin, TestCaseWithFactory):
             recipe = self.factory.makeOCIRecipe(
                 oci_project=oci_project, owner=self.person,
                 registrant=self.person)
-            push_rule = self.factory.makeOCIPushRule(
+            self.factory.makeOCIPushRule(
                 recipe=recipe, image_name=image_name)
             url = api_url(recipe)
 
diff --git a/lib/lp/oci/vocabularies.py b/lib/lp/oci/vocabularies.py
index 2e44624..aa1fae3 100644
--- a/lib/lp/oci/vocabularies.py
+++ b/lib/lp/oci/vocabularies.py
@@ -8,9 +8,14 @@ from __future__ import absolute_import, print_function, unicode_literals
 __metaclass__ = type
 __all__ = []
 
+from zope.interface import implementer
 from zope.schema.vocabulary import SimpleTerm
 
-from lp.services.webapp.vocabulary import StormVocabularyBase
+from lp.oci.model.ocirecipe import OCIRecipe
+from lp.services.webapp.vocabulary import (
+    IHugeVocabulary,
+    StormVocabularyBase,
+    )
 from lp.soyuz.model.distroarchseries import DistroArchSeries
 
 
@@ -28,3 +33,30 @@ class OCIRecipeDistroArchSeriesVocabulary(StormVocabularyBase):
 
     def __len__(self):
         return len(self.context.getAllowedArchitectures())
+
+
+@implementer(IHugeVocabulary)
+class OCIRecipeVocabulary(StormVocabularyBase):
+    """All OCI Recipes of a given OCI project."""
+
+    _table = OCIRecipe
+    displayname = 'Select a recipe'
+    step_title = 'Search'
+
+    def toTerm(self, recipe):
+        token = "%s/%s" % (recipe.owner.name, recipe.name)
+        title = "~%s" % token
+        return SimpleTerm(recipe, token, title)
+
+    def getTermByToken(self, token):
+        owner_name, recipe_name = token.split('/')
+        recipe = self.context.getRecipeByNameAndOwner(recipe_name, owner_name)
+        if recipe is None:
+            raise LookupError(token)
+        return self.toTerm(recipe)
+
+    def search(self, query, vocab_filter=None):
+        return self.context.searchRecipes(query)
+
+    def _entries(self):
+        return self.context.getRecipes()
diff --git a/lib/lp/oci/vocabularies.zcml b/lib/lp/oci/vocabularies.zcml
index fae4a6d..1a6b75c 100644
--- a/lib/lp/oci/vocabularies.zcml
+++ b/lib/lp/oci/vocabularies.zcml
@@ -15,4 +15,15 @@
         <allow interface="lp.services.webapp.vocabulary.IHugeVocabulary" />
     </class>
 
+    <securedutility
+        name="OCIRecipe"
+        component="lp.oci.vocabularies.OCIRecipeVocabulary"
+        provides="zope.schema.interfaces.IVocabularyFactory">
+        <allow interface="zope.schema.interfaces.IVocabularyFactory" />
+    </securedutility>
+
+    <class class="lp.oci.vocabularies.OCIRecipeVocabulary">
+        <allow interface="lp.services.webapp.vocabulary.IHugeVocabulary" />
+    </class>
+
 </configure>
diff --git a/lib/lp/registry/browser/ociproject.py b/lib/lp/registry/browser/ociproject.py
index 700af68..eedec0c 100644
--- a/lib/lp/registry/browser/ociproject.py
+++ b/lib/lp/registry/browser/ociproject.py
@@ -15,7 +15,9 @@ __all__ = [
     ]
 
 from zope.component import getUtility
+from zope.formlib import form
 from zope.interface import implementer
+from zope.schema import Choice
 
 from lp.app.browser.launchpadform import (
     action,
@@ -170,8 +172,17 @@ class OCIProjectEditView(LaunchpadEditFormView):
     field_names = [
         'distribution',
         'name',
+        'official_recipe',
         ]
 
+    def extendFields(self):
+        official_recipe = self.context.getOfficialRecipe()
+        self.form_fields += form.Fields(
+            Choice(
+                __name__="official_recipe", title=u"Official recipe",
+                required=False, vocabulary="OCIRecipe",
+                default=official_recipe))
+
     @property
     def label(self):
         return 'Edit %s OCI project' % self.context.name
@@ -193,7 +204,9 @@ class OCIProjectEditView(LaunchpadEditFormView):
 
     @action('Update OCI project', name='update')
     def update_action(self, action, data):
+        official_recipe = data.pop("official_recipe")
         self.updateContextFromData(data)
+        self.context.setOfficialRecipe(official_recipe)
 
     @property
     def next_url(self):
diff --git a/lib/lp/registry/browser/tests/test_ociproject.py b/lib/lp/registry/browser/tests/test_ociproject.py
index 5d08e1c..5a22137 100644
--- a/lib/lp/registry/browser/tests/test_ociproject.py
+++ b/lib/lp/registry/browser/tests/test_ociproject.py
@@ -13,6 +13,7 @@ from datetime import datetime
 
 import pytz
 
+from lp.oci.interfaces.ocirecipe import OCI_RECIPE_ALLOW_CREATE
 from lp.registry.interfaces.ociproject import (
     OCI_PROJECT_ALLOW_CREATE,
     OCIProjectCreateFeatureDisabled,
@@ -22,6 +23,7 @@ from lp.services.features.testing import FeatureFixture
 from lp.services.webapp import canonical_url
 from lp.services.webapp.escaping import structured
 from lp.testing import (
+    admin_logged_in,
     BrowserTestCase,
     person_logged_in,
     test_tales,
@@ -94,6 +96,13 @@ class TestOCIProjectEditView(BrowserTestCase):
 
     layer = DatabaseFunctionalLayer
 
+    def submitEditForm(self, browser, name, official_recipe=''):
+        browser.getLink("Edit OCI project").click()
+        browser.getControl(name="field.name").value = name
+        browser.getControl(name="field.official_recipe").value = (
+            official_recipe)
+        browser.getControl("Update OCI project").click()
+
     def test_edit_oci_project(self):
         oci_project = self.factory.makeOCIProject()
         new_distribution = self.factory.makeDistribution(
@@ -127,7 +136,8 @@ class TestOCIProjectEditView(BrowserTestCase):
         with person_logged_in(oci_project.pillar.owner):
             view = create_initialized_view(
                 oci_project, name="+edit", principal=oci_project.pillar.owner)
-            view.update_action.success({"name": "changed"})
+            view.update_action.success(
+                {"name": "changed", "official_recipe": None})
         self.assertSqlAttributeEqualsDate(
             oci_project, "date_last_modified", UTC_NOW)
 
@@ -138,9 +148,7 @@ class TestOCIProjectEditView(BrowserTestCase):
         pillar_display_name = oci_project.pillar.display_name
         browser = self.getViewBrowser(
             oci_project, user=oci_project.pillar.owner)
-        browser.getLink("Edit OCI project").click()
-        browser.getControl(name="field.name").value = "two"
-        browser.getControl("Update OCI project").click()
+        self.submitEditForm(browser, "two")
         self.assertEqual(
             "There is already an OCI project in %s with this name." % (
                 pillar_display_name),
@@ -150,13 +158,76 @@ class TestOCIProjectEditView(BrowserTestCase):
         oci_project = self.factory.makeOCIProject()
         browser = self.getViewBrowser(
             oci_project, user=oci_project.pillar.owner)
-        browser.getLink("Edit OCI project").click()
-        browser.getControl(name="field.name").value = "invalid name"
-        browser.getControl("Update OCI project").click()
+        self.submitEditForm(browser, "invalid name")
+
         self.assertStartsWith(
             extract_text(find_tags_by_class(browser.contents, "message")[1]),
             "Invalid name 'invalid name'.")
 
+    def test_edit_oci_project_setting_official_recipe(self):
+        self.useFixture(FeatureFixture({OCI_RECIPE_ALLOW_CREATE: 'on'}))
+
+        with admin_logged_in():
+            oci_project = self.factory.makeOCIProject()
+            user = oci_project.pillar.owner
+            recipe1 = self.factory.makeOCIRecipe(
+                registrant=user, owner=user, oci_project=oci_project)
+            recipe2 = self.factory.makeOCIRecipe(
+                registrant=user, owner=user, oci_project=oci_project)
+
+            name_value = oci_project.name
+            recipe_value = "%s/%s" % (user.name, recipe1.name)
+
+        browser = self.getViewBrowser(oci_project, user=user)
+        self.submitEditForm(browser, name_value, recipe_value)
+
+        with admin_logged_in():
+            self.assertEqual(recipe1, oci_project.getOfficialRecipe())
+            self.assertTrue(recipe1.official)
+            self.assertFalse(recipe2.official)
+
+    def test_edit_oci_project_overriding_official_recipe(self):
+        self.useFixture(FeatureFixture({OCI_RECIPE_ALLOW_CREATE: 'on'}))
+        with admin_logged_in():
+            oci_project = self.factory.makeOCIProject()
+            user = oci_project.pillar.owner
+            recipe1 = self.factory.makeOCIRecipe(
+                registrant=user, owner=user, oci_project=oci_project)
+            recipe2 = self.factory.makeOCIRecipe(
+                registrant=user, owner=user, oci_project=oci_project)
+
+            # Sets recipe1 as the current official one
+            oci_project.setOfficialRecipe(recipe1)
+
+            # And we will try to set recipe2 as the new official.
+            name_value = oci_project.name
+            recipe_value = "%s/%s" % (user.name, recipe2.name)
+
+        browser = self.getViewBrowser(oci_project, user=user)
+        self.submitEditForm(browser, name_value, recipe_value)
+
+        with admin_logged_in():
+            self.assertEqual(recipe2, oci_project.getOfficialRecipe())
+            self.assertFalse(recipe1.official)
+            self.assertTrue(recipe2.official)
+
+    def test_edit_oci_project_unsetting_official_recipe(self):
+        self.useFixture(FeatureFixture({OCI_RECIPE_ALLOW_CREATE: 'on'}))
+        with admin_logged_in():
+            oci_project = self.factory.makeOCIProject()
+            user = oci_project.pillar.owner
+            recipe = self.factory.makeOCIRecipe(
+                registrant=user, owner=user, oci_project=oci_project)
+            oci_project.setOfficialRecipe(recipe)
+            name_value = oci_project.name
+
+        browser = self.getViewBrowser(oci_project, user=user)
+        self.submitEditForm(browser, name_value, '')
+
+        with admin_logged_in():
+            self.assertEqual(None, oci_project.getOfficialRecipe())
+            self.assertFalse(recipe.official)
+
 
 class TestOCIProjectAddView(BrowserTestCase):
 
diff --git a/lib/lp/registry/interfaces/ociproject.py b/lib/lp/registry/interfaces/ociproject.py
index 6d0b9bc..8e66f5d 100644
--- a/lib/lp/registry/interfaces/ociproject.py
+++ b/lib/lp/registry/interfaces/ociproject.py
@@ -85,6 +85,18 @@ class IOCIProjectView(IHasGitRepositories, Interface):
     def getSeriesByName(name):
         """Get an OCIProjectSeries for this OCIProject by series' name."""
 
+    def getRecipeByNameAndOwner(recipe_name, owner_name):
+        """Returns the exact match search for recipe_name AND owner_name."""
+
+    def getRecipes():
+        """Returns the set of OCI recipes for this project."""
+
+    def searchRecipes(query):
+        """Searches for recipes in this OCI project."""
+
+    def getOfficialRecipe():
+        """Gets the official recipe for this OCI project."""
+
 
 class IOCIProjectEditableAttributes(IBugTarget):
     """IOCIProject attributes that can be edited.
@@ -120,6 +132,10 @@ class IOCIProjectEdit(Interface):
                   status=SeriesStatus.DEVELOPMENT, date_created=DEFAULT):
         """Creates a new `IOCIProjectSeries`."""
 
+    def setOfficialRecipe(recipe):
+        """Sets the given recipe as the official one. If recipe is None,
+        the current official recipe will be unset."""
+
 
 class IOCIProjectLegitimate(Interface):
     """IOCIProject methods that require launchpad.AnyLegitimatePerson
diff --git a/lib/lp/registry/model/ociproject.py b/lib/lp/registry/model/ociproject.py
index 230f32a..0d94e38 100644
--- a/lib/lp/registry/model/ociproject.py
+++ b/lib/lp/registry/model/ociproject.py
@@ -36,6 +36,7 @@ from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.model.ociprojectname import OCIProjectName
 from lp.registry.model.ociprojectseries import OCIProjectSeries
+from lp.registry.model.person import Person
 from lp.services.database.bulk import load_related
 from lp.services.database.constants import (
     DEFAULT,
@@ -149,6 +150,53 @@ class OCIProject(BugTargetBase, StormBase):
     def getSeriesByName(self, name):
         return self.series.find(OCIProjectSeries.name == name).one()
 
+    def getRecipes(self):
+        """See `IOCIProject`."""
+        from lp.oci.model.ocirecipe import OCIRecipe
+        rs = IStore(OCIRecipe).find(
+            OCIRecipe,
+            OCIRecipe.owner_id == Person.id,
+            OCIRecipe.oci_project == self)
+        return rs.order_by(Person.name, OCIRecipe.name)
+
+    def getRecipeByNameAndOwner(self, recipe_name, owner_name):
+        """See `IOCIProject`."""
+        from lp.oci.model.ocirecipe import OCIRecipe
+        q = self.getRecipes().find(
+            OCIRecipe.name == recipe_name,
+            Person.name == owner_name)
+        return q.one()
+
+    def searchRecipes(self, query):
+        """See `IOCIProject`."""
+        from lp.oci.model.ocirecipe import OCIRecipe
+        q = self.getRecipes().find(
+            OCIRecipe.name.contains_string(query) |
+            Person.name.contains_string(query))
+        return q.order_by(Person.name, OCIRecipe.name)
+
+    def getOfficialRecipe(self):
+        """See `IOCIProject`."""
+        from lp.oci.model.ocirecipe import OCIRecipe
+        return self.getRecipes().find(OCIRecipe._official == True).one()
+
+    def setOfficialRecipe(self, recipe):
+        """See `IOCIProject`."""
+        if recipe is not None and recipe.oci_project != self:
+            raise ValueError(
+                "An OCI recipe cannot be set as the official recipe of "
+                "another OCI project.")
+        # Removing security proxy here because `_official` is a private
+        # attribute not declared on the Interface, and we need to set it
+        # regardless of security checks on OCIRecipe objects.
+        recipe = removeSecurityProxy(recipe)
+        previous = removeSecurityProxy(self.getOfficialRecipe())
+        if previous != recipe:
+            if previous is not None:
+                previous._official = False
+            if recipe is not None:
+                recipe._official = True
+
 
 @implementer(IOCIProjectSet)
 class OCIProjectSet: