0002-sql-add-workflow_merged_roles_dict-jsonb-column-5888.patch

Frédéric Péters, 08 février 2022 09:56

Voir les différences: en ligne côte à côte

Subject: [PATCH 2/3] sql: add workflow_merged_roles_dict jsonb column (#58881)

 tests/test_sql.py | 60 +++++++++++++++++++++++++++++++++++++++++++++++
 wcs/formdata.py   | 17 ++++++++++++++
 wcs/sql.py        | 32 ++++++++++++++++++++-----
 3 files changed, 103 insertions(+), 6 deletions(-)

         assert sql.SqlUser.get(id=user2.id).is_active is True
     def test_migration_58_workflow_roles_dict(pub):
         formdef = FormDef()
         formdef.name = 'tests migration 58'
         formdef.fields = []
         formdef.workflow_roles = {'_receiver': '123'}
         formdef.store()
         formdata = formdef.data_class()()
         formdata.store()
         formdata = formdef.data_class()()
         formdata.workflow_roles = {'_receiver': ['_user:123', '_user:456']}
         formdata.store()
         conn, cur = sql.get_connection_and_cursor()
         cur.execute('UPDATE wcs_meta SET value = 57 WHERE key = %s', ('sql_level',))
         conn.commit()
         cur.close()
         conn, cur = sql.get_connection_and_cursor()
         cur.execute('ALTER TABLE %s DROP COLUMN workflow_merged_roles_dict' % formdef.table_name)
         sql.migrate()
         assert column_exists_in_table(cur, formdef.table_name, 'workflow_merged_roles_dict')
         assert migration_level(cur) >= 58
         assert sql.is_reindex_needed('formdata', conn=conn, cur=cur) is True
         assert formdef.data_class().count([st.Null('workflow_merged_roles_dict')]) == 2
         sql.reindex()
         assert formdef.data_class().count([st.Null('workflow_merged_roles_dict')]) == 0
     def test_workflow_roles_dict_change(pub):
         formdef = FormDef()
         formdef.name = 'test_workflow_roles_dict_change'
         formdef.fields = []
         formdef.workflow_roles = {'_receiver': '123'}
         formdef.store()
         formdata = formdef.data_class()()
         formdata.workflow_roles = {'_receiver': ['_user:123', '_user:456']}
         formdata.store()
         conn, cur = sql.get_connection_and_cursor()
         cur.execute('SELECT workflow_merged_roles_dict FROM %s WHERE id = %s' % (formdef.table_name, formdata.id))
         merged_roles_dict = cur.fetchone()[0]
         assert merged_roles_dict == {'_receiver': ['123', '_user:123', '_user:456']}
         conn.commit()
         cur.close()
         formdef.workflow_roles = {'_receiver': '234'}
         formdef.store()
         formdef.data_class().rebuild_security()
         conn, cur = sql.get_connection_and_cursor()
         cur.execute('SELECT workflow_merged_roles_dict FROM %s WHERE id = %s' % (formdef.table_name, formdata.id))
         merged_roles_dict = cur.fetchone()[0]
         assert merged_roles_dict == {'_receiver': ['234', '_user:123', '_user:456']}
         conn.commit()
         cur.close()
     def test_logged_error_store_without_integrity_error(pub, sql_queries):
         sql.LoggedError.record('there was an error')

                 status = self.status
             return status == 'draft'
         @property
         def workflow_merged_roles_dict(self):
             merged_dict = {}
             for k, v in (self.formdef.workflow_roles or {}).items():
                 merged_dict[k] = [v]
             for k, v in (self.workflow_roles or {}).items():
                 if k not in merged_dict:
                     merged_dict[k] = []
                 merged_dict[k].extend(v)
             return merged_dict
         @workflow_merged_roles_dict.setter
         def workflow_merged_roles_dict(self, value):
             # do not do anything, this setter is just there as the SQL retrieval will
             # try to set the property.
             pass
         def get_concerned_roles(self):
             if self.is_draft():
                 # drafts are only visible to submitter

             'page_no',
             'anonymised',
             'workflow_roles',
             # workflow_merged_roles_dict combines workflow_roles from formdef and
             # formdata and is used to filter on function assignment.
             'workflow_merged_roles_dict',
             # workflow_roles_array is created from workflow_roles to be used in
             # get_ids_with_indexed_value
             'workflow_roles_array',
-...
         if 'workflow_roles' not in existing_fields:
             cur.execute('''ALTER TABLE %s ADD COLUMN workflow_roles bytea''' % table_name)
             cur.execute('''ALTER TABLE %s ADD COLUMN workflow_roles_array text[]''' % table_name)
         if 'workflow_merged_roles_dict' not in existing_fields:
             cur.execute('''ALTER TABLE %s ADD COLUMN workflow_merged_roles_dict jsonb''' % table_name)
         if 'concerned_roles_array' not in existing_fields:
             cur.execute('''ALTER TABLE %s ADD COLUMN concerned_roles_array text[]''' % table_name)
         if 'actions_roles_array' not in existing_fields:
-...
             ('prefilling_data', 'bytea'),
             ('id_display', 'varchar'),
             ('workflow_roles', 'bytea'),
             ('workflow_merged_roles_dict', 'jsonb'),
             ('workflow_roles_array', 'text[]'),
             ('concerned_roles_array', 'text[]'),
             ('actions_roles_array', 'text[]'),
-...
                 'submission_agent_id': self.submission_agent_id,
                 'submission_channel': self.submission_channel,
                 'criticality_level': self.criticality_level,
                 'workflow_merged_roles_dict': self.workflow_merged_roles_dict,
+            }
             if self.last_update_time:
                 sql_dict['last_update_time'] = datetime.datetime.fromtimestamp(time.mktime(self.last_update_time))
-...
             for formdata in formdatas:
                 sql_statement = (
                     '''UPDATE %s
                                       SET concerned_roles_array = %%(roles)s,
                                           actions_roles_array = %%(actions_roles)s
                                     WHERE id = %%(id)s'''
                           SET concerned_roles_array = %%(roles)s,
                               actions_roles_array = %%(actions_roles)s,
                               workflow_merged_roles_dict = %%(workflow_merged_roles_dict)s
                         WHERE id = %%(id)s'''
                     % cls._table_name
+                )
                 with get_publisher().substitutions.temporary_feed(formdata):
-...
                             'id': formdata.id,
                             'roles': [str(x) for x in formdata.concerned_roles if x],
                             'actions_roles': [str(x) for x in formdata.actions_roles if x],
                             'workflow_merged_roles_dict': formdata.workflow_merged_roles_dict,
                         },
+                    )
             conn.commit()
-...
     # latest migration, number + description (description is not used
     # programmaticaly but will make sure git conflicts if two migrations are
     # separately added with the same number)
     SQL_LEVEL = (57, 'store tokens in SQL')
     SQL_LEVEL = (58, 'add workflow_merged_roles_dict')
     def migrate_global_views(conn, cur):
-...
             # 21: (second part), store ascii_name of users
             # 23: (first part), use misc.simplify() over full text queries
             set_reindex('user', 'needed', conn=conn, cur=cur)
         if sql_level < 51:
         if sql_level < 58:
             # 17: store last_update_time in tables
             # 18: add user name to full-text search index
             # 21: (third part), add user ascii_names to full-text index
-...
             # 57: store tokens in SQL
             do_tokens_table()
             migrate_legacy_tokens()
         if sql_level < 58:
             # 58: add workflow_merged_roles_dict as a jsonb column with
             #     combined formdef and formdata value.
             from wcs.carddef import CardDef
             from wcs.formdef import FormDef
             for formdef in FormDef.select() + CardDef.select():
                 do_formdef_tables(formdef, rebuild_views=False, rebuild_global_views=False)
             migrate_views(conn, cur)
             set_reindex('formdata', 'needed', conn=conn, cur=cur)
         cur.execute('''UPDATE wcs_meta SET value = %s WHERE key = %s''', (str(SQL_LEVEL[0]), 'sql_level'))
-...
                 user.store()
             set_reindex('user', 'done', conn=conn, cur=cur)
         from wcs.carddef import CardDef
         from wcs.formdef import FormDef
         if is_reindex_needed('formdata', conn=conn, cur=cur):
             # load and store all formdatas
             for formdef in FormDef.select():
             for formdef in FormDef.select() + CardDef.select():
                 for formdata in formdef.data_class().select(iterator=True):
                     try:
                         formdata.migrate()
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0002-sql-add-workflow_merged_roles_dict-jsonb-column-5888.patch