0001-sql-remove-redundant-get_users_with_-methods-70937.patch

Paul Marillonnet, 02 novembre 2022 16:56

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

Subject: [PATCH] sql: remove redundant get_users_with_* methods (#70937)

These have now been defined in the users.User parent class, relying
on w.c.s.'s ORM instead of direct inline SQL.

 tests/test_sql.py   | 31 ------------------------
 tests/test_users.py | 17 ++++++++++++++
 wcs/sql.py          | 57 ---------------------------------------------
 3 files changed, 17 insertions(+), 88 deletions(-)

         pub.write_cfg()
     def test_get_users_with_role(pub):
         sql.SqlUser.wipe()
         user = sql.SqlUser()
         user.name = 'Pierre'
         user.roles = [1]
         user.store()
         user = sql.SqlUser()
         user.name = 'Papier'
         user.store()
         assert len(sql.SqlUser.get_users_with_role(1)) == 1
     def test_get_users_with_name_identifier(pub):
         sql.SqlUser.wipe()
         user = sql.SqlUser()
         user.name = 'Pierre'
         user.name_identifiers = ['foo']
         user.store()
         user = sql.SqlUser()
         user.name = 'Papier'
         user.store()
         assert len(sql.SqlUser.get_users_with_name_identifier('foo')) == 1
         assert sql.SqlUser.get_users_with_name_identifier('foo')[0].name == 'Pierre'
     def test_get_users_fts(pub):
         sql.SqlUser.wipe()

         assert pub.user_class.get_users_with_role(1)[0].name == 'Pierre'
     def test_get_users_with_email():
         pub.user_class.wipe()
         user = pub.user_class()
         user.name = 'Pierre'
         user.email = 'pierre@ad.dress'
         user.store()
         user = pub.user_class()
         user.name = 'Papier'
         user.email = 'papier@ad.dress'
         user.store()
         assert len(pub.user_class.get_users_with_email('pierre@ad.dress')) == 1
         assert pub.user_class.get_users_with_email('pierre@ad.dress')[0].name == 'Pierre'
     def test_user_formdef_getattr():
         from wcs.admin.settings import UserFieldsFormDef

             conn.commit()
             cur.close()
         @classmethod
         @guard_postgres
         def get_users_with_name_identifier(cls, name_identifier):
             conn, cur = get_connection_and_cursor()
             sql_statement = '''SELECT %s
                                  FROM %s
                                 WHERE deleted_timestamp IS NULL
                                   AND name_identifiers @> ARRAY[%%(value)s]''' % (
                 ', '.join([x[0] for x in cls._table_static_fields] + cls.get_data_fields()),
                 cls._table_name,
+            )
             cur.execute(sql_statement, {'value': name_identifier})
             objects = cls.get_objects(cur)
             conn.commit()
             cur.close()
             return objects
         @classmethod
         @guard_postgres
         def get_users_with_email(cls, email):
             conn, cur = get_connection_and_cursor()
             sql_statement = '''SELECT %s
                                  FROM %s
                                 WHERE deleted_timestamp IS NULL
                                   AND email = %%(value)s''' % (
                 ', '.join([x[0] for x in cls._table_static_fields] + cls.get_data_fields()),
                 cls._table_name,
+            )
             cur.execute(sql_statement, {'value': email})
             objects = cls.get_objects(cur)
             conn.commit()
             cur.close()
             return objects
         @classmethod
         @guard_postgres
         def get_users_with_role(cls, role_id):
             conn, cur = get_connection_and_cursor()
             sql_statement = '''SELECT %s
                                  FROM %s
                                 WHERE deleted_timestamp IS NULL
                                   AND roles @> ARRAY[%%(value)s]''' % (
                 ', '.join([x[0] for x in cls._table_static_fields] + cls.get_data_fields()),
                 cls._table_name,
+            )
             cur.execute(sql_statement, {'value': str(role_id)})
             objects = cls.get_objects(cur)
             conn.commit()
             cur.close()
             return objects
     class Role(SqlMixin, wcs.roles.Role):
         _table_name = 'roles'
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-sql-remove-redundant-get_users_with_-methods-70937.patch