From 874b20755bd3ebc5374e993eded31b19e63a4767 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Behmo?= <regis@behmo.com>
Date: Tue, 17 Nov 2020 13:07:52 +0100
Subject: [PATCH] Upgrade to Koa

---
 .gitlab-ci.yml                                    | 2 +-
 README.rst                                        | 4 ++--
 setup.py                                          | 2 +-
 tutornotes/__about__.py                           | 2 +-
 tutornotes/templates/notes/apps/settings/tutor.py | 9 ++-------
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9118fb4..cd4a793 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ variables:
     TUTOR_PLUGIN: notes
     TUTOR_IMAGES: notes
     TUTOR_PYPI_PACKAGE: tutor-notes
-    OPENEDX_RELEASE: juniper
+    OPENEDX_RELEASE: koa
 
 include:
   - project: 'community/tutor-ci'
diff --git a/README.rst b/README.rst
index aa72659..eaee5e1 100644
--- a/README.rst
+++ b/README.rst
@@ -1,9 +1,9 @@
 Students notes plugin for `Tutor <https://docs.tutor.overhang.io>`_
 ===================================================================
 
-This is a plugin for `Tutor <https://docs.tutor.overhang.io>`_ to easily add the `Open edX note-taking app <https://github.com/edx/edx-notes-api>`_ to an Open edX platform. This app allows students to annotate portions of the courseware (see `the official documentation <https://edx.readthedocs.io/projects/open-edx-building-and-running-a-course/en/open-release-juniper.master/exercises_tools/notes.html>`_).
+This is a plugin for `Tutor <https://docs.tutor.overhang.io>`_ to easily add the `Open edX note-taking app <https://github.com/edx/edx-notes-api>`_ to an Open edX platform. This app allows students to annotate portions of the courseware (see `the official documentation <https://edx.readthedocs.io/projects/open-edx-building-and-running-a-course/en/open-release-koa.master/exercises_tools/notes.html>`_).
 
-.. image:: https://edx.readthedocs.io/projects/open-edx-building-and-running-a-course/en/open-release-juniper.master/_images/SFD_SN_bodyexample.png
+.. image:: https://edx.readthedocs.io/projects/open-edx-building-and-running-a-course/en/open-release-koa.master/_images/SFD_SN_bodyexample.png
     :alt: Notes in action
 
 Installation
diff --git a/setup.py b/setup.py
index a2848c3..bc0774e 100644
--- a/setup.py
+++ b/setup.py
@@ -31,7 +31,7 @@ setup(
     packages=find_packages(exclude=["tests*"]),
     include_package_data=True,
     python_requires=">=3.5",
-    install_requires=["tutor-openedx>=10.0.0,<11.0.0"],
+    install_requires=["tutor-openedx>=11.0.0,<12.0.0"],
     entry_points={"tutor.plugin.v0": ["notes = tutornotes.plugin"]},
     classifiers=[
         "Development Status :: 5 - Production/Stable",
diff --git a/tutornotes/__about__.py b/tutornotes/__about__.py
index 656e1e0..5b46116 100644
--- a/tutornotes/__about__.py
+++ b/tutornotes/__about__.py
@@ -1 +1 @@
-__version__ = "10.1.4"
+__version__ = "11.0.0"
diff --git a/tutornotes/templates/notes/apps/settings/tutor.py b/tutornotes/templates/notes/apps/settings/tutor.py
index a3e3873..449883b 100644
--- a/tutornotes/templates/notes/apps/settings/tutor.py
+++ b/tutornotes/templates/notes/apps/settings/tutor.py
@@ -23,13 +23,8 @@ DATABASES = {
 CLIENT_ID = "notes"
 CLIENT_SECRET = "{{ NOTES_OAUTH2_SECRET }}"
 
-HAYSTACK_CONNECTIONS = {
-    "default": {
-        "ENGINE": "notesserver.highlight.ElasticsearchSearchEngine",
-        "URL": "http://{{ ELASTICSEARCH_HOST }}:{{ ELASTICSEARCH_PORT }}/",
-        "INDEX_NAME": "notes",
-    }
-}
+ELASTICSEARCH_DSL["default"]["hosts"] = "{{ ELASTICSEARCH_HOST }}:{{ ELASTICSEARCH_PORT }}"
+ELASTICSEARCH_INDEX_NAMES = {"notesapi.v1.search_indexes.documents.note": "notes"}
 
 LOGGING = {
     "version": 1,