feat: update database fields

2026-05-12 19:25:31 +08:00
parent 37b08927a7
commit bdee3b3efa
6 changed files with 146 additions and 184 deletions
--- a/backend/database.py
+++ b/backend/database.py
@@ -119,10 +119,10 @@ class CalendarDatabase:
    # ======================= token related internal operation
    def tokenOper_clean(self):
        # remove outdated token
-        self.cursor.execute('DELETE FROM token WHERE [ccn_tokenExpireOn] <= ?',(utils.GetCurrentTimestamp(), ))
+        self.cursor.execute('DELETE FROM token WHERE [token_expire_on] <= ?',(utils.GetCurrentTimestamp(), ))

    def tokenOper_postpone_expireOn(self, token):
-        self.cursor.execute('UPDATE token SET [ccn_tokenExpireOn] = ? WHERE [ccn_token] = ?;', (
+        self.cursor.execute('UPDATE token SET [token_expire_on] = ? WHERE [token] = ?;', (
            utils.GetTokenExpireOn(),
            token
        ))
@@ -131,12 +131,12 @@ class CalendarDatabase:
        self.tokenOper_get_username(token)

    def tokenOper_is_admin(self, username):
-        self.cursor.execute('SELECT [ccn_isAdmin] FROM user WHERE [ccn_name] = ?;',(username, ))
+        self.cursor.execute('SELECT [is_admin] FROM user WHERE [name] = ?;',(username, ))
        cache = self.cursor.fetchone()[0]
        return cache == 1

    def tokenOper_get_username(self, token):
-        self.cursor.execute('SELECT [ccn_user] FROM token WHERE [ccn_token] = ? AND [ccn_tokenExpireOn] > ?;',(
+        self.cursor.execute('SELECT [user] FROM token WHERE [token] = ? AND [token_expire_on] > ?;',(
            token,
            utils.GetCurrentTimestamp()
        ))
@@ -151,7 +151,7 @@ class CalendarDatabase:
    @SafeDatabaseOperation
    def common_salt(self, username):
        salt = utils.GenerateSalt()
-        self.cursor.execute('UPDATE user SET [ccn_salt] = ? WHERE [ccn_name] = ?;', (
+        self.cursor.execute('UPDATE user SET [salt] = ? WHERE [name] = ?;', (
            salt,
            username
        ))
@@ -159,12 +159,12 @@ class CalendarDatabase:

    @SafeDatabaseOperation
    def common_login(self, username, password, clientUa, clientIp):
-        self.cursor.execute('SELECT [ccn_password], [ccn_salt] FROM user WHERE [ccn_name] = ?;', (username, ))
+        self.cursor.execute('SELECT [password], [salt] FROM user WHERE [name] = ?;', (username, ))
        (gotten_salt, gotten_password) = self.cursor.fetchone()
        
        if password == utils.ComputePasswordHashWithSalt(gotten_password, gotten_salt):
            token = utils.GenerateToken(username)
-            self.cursor.execute('UPDATE user SET [ccn_salt] = ? WHERE [ccn_name] = ?;', (
+            self.cursor.execute('UPDATE user SET [salt] = ? WHERE [name] = ?;', (
                utils.GenerateSalt(), # regenerate a new slat to prevent re-login try
                username
            ))
@@ -182,7 +182,7 @@ class CalendarDatabase:

    @SafeDatabaseOperation
    def common_webLogin(self, username, password, clientUa, clientIp):
-        self.cursor.execute('SELECT [ccn_name] FROM user WHERE [ccn_name] = ? AND [ccn_password] = ?;', (username, utils.ComputePasswordHash(password)))
+        self.cursor.execute('SELECT [name] FROM user WHERE [name] = ? AND [password] = ?;', (username, utils.ComputePasswordHash(password)))

        if len(self.cursor.fetchall()) != 0:
            token = utils.GenerateToken(username)
@@ -201,7 +201,7 @@ class CalendarDatabase:
    @SafeDatabaseOperation
    def common_logout(self, token):
        self.tokenOper_check_valid(token)
-        self.cursor.execute('DELETE FROM token WHERE [ccn_token] = ?;', (token, ))
+        self.cursor.execute('DELETE FROM token WHERE [token] = ?;', (token, ))
        return True

    @SafeDatabaseOperation
@@ -214,24 +214,24 @@ class CalendarDatabase:
    def calendar_getFull(self, token, startDateTime, endDateTime):
        username = self.tokenOper_get_username(token)
        self.cursor.execute('SELECT calendar.* FROM calendar INNER JOIN collection \
-                ON collection.ccn_uuid = calendar.ccn_belongTo \
-                WHERE (collection.ccn_user = ? AND calendar.ccn_loopDateTimeEnd >= ? AND calendar.ccn_loopDateTimeStart - (calendar.ccn_eventDateTimeEnd - calendar.ccn_eventDateTimeStart) <= ?);', 
+                ON collection.uuid = calendar.belong_to \
+                WHERE (collection.user = ? AND calendar.loop_date_time_end >= ? AND calendar.loop_date_time_start - (calendar.event_date_time_end - calendar.event_date_time_start) <= ?);', 
                (username, startDateTime, endDateTime))
        return self.cursor.fetchall()

    @SafeDatabaseOperation
    def calendar_getList(self, token, startDateTime, endDateTime):
        username = self.tokenOper_get_username(token)
-        self.cursor.execute('SELECT calendar.ccn_uuid FROM calendar INNER JOIN collection \
-                ON collection.ccn_uuid = calendar.ccn_belongTo \
-                WHERE (collection.ccn_user = ? AND calendar.ccn_loopDateTimeEnd >= ? AND calendar.ccn_loopDateTimeStart - (calendar.ccn_eventDateTimeEnd - calendar.ccn_eventDateTimeStart) <= ?);', 
+        self.cursor.execute('SELECT calendar.uuid FROM calendar INNER JOIN collection \
+                ON collection.uuid = calendar.belong_to \
+                WHERE (collection.user = ? AND calendar.loop_date_time_end >= ? AND calendar.loop_date_time_start - (calendar.event_date_time_end - calendar.event_date_time_start) <= ?);', 
                (username, startDateTime, endDateTime))
        return tuple(map(lambda x: x[0], self.cursor.fetchall()))

    @SafeDatabaseOperation
    def calendar_getDetail(self, token, uuid):
        self.tokenOper_check_valid(token)
-        self.cursor.execute('SELECT * FROM calendar WHERE [ccn_uuid] = ?;', (uuid, ))
+        self.cursor.execute('SELECT * FROM calendar WHERE [uuid] = ?;', (uuid, ))
        return self.cursor.fetchone()

    @SafeDatabaseOperation
@@ -239,13 +239,13 @@ class CalendarDatabase:
        self.tokenOper_check_valid(token)

        # get prev data
-        self.cursor.execute('SELECT * FROM calendar WHERE [ccn_uuid] = ? AND [ccn_lastChange] = ?;', (uuid, lastChange))
+        self.cursor.execute('SELECT * FROM calendar WHERE [uuid] = ? AND [last_change] = ?;', (uuid, lastChange))
        analyseData = list(self.cursor.fetchone())

        # construct update data
        lastupdate = utils.GenerateUUID()
        sqlList = [
-            '[ccn_lastChange] = ?',
+            '[last_change] = ?',
        ]
        argumentsList = [
            lastupdate,
@@ -256,44 +256,44 @@ class CalendarDatabase:

        cache = optArgs.get('belongTo', None)
        if cache is not None:
-            sqlList.append('[ccn_belongTo] = ?')
+            sqlList.append('[belong_to] = ?')
            argumentsList.append(cache)
        cache = optArgs.get('title', None)
        if cache is not None:
-            sqlList.append('[ccn_title] = ?')
+            sqlList.append('[title] = ?')
            argumentsList.append(cache)
        cache = optArgs.get('description', None)
        if cache is not None:
-            sqlList.append('[ccn_description] = ?')
+            sqlList.append('[description] = ?')
            argumentsList.append(cache)
        cache = optArgs.get('eventDateTimeStart', None)
        if cache is not None:
-            sqlList.append('[ccn_eventDateTimeStart] = ?')
+            sqlList.append('[event_date_time_start] = ?')
            argumentsList.append(cache)
            reAnalyseLoop = True
            analyseData[5] = cache
        cache = optArgs.get('eventDateTimeEnd', None)
        if cache is not None:
-            sqlList.append('[ccn_eventDateTimeEnd] = ?')
+            sqlList.append('[event_date_time_end] = ?')
            argumentsList.append(cache)
        cache = optArgs.get('loopRules', None)
        if cache is not None:
-            sqlList.append('[ccn_loopRules] = ?')
+            sqlList.append('[loop_rules] = ?')
            argumentsList.append(cache)
            reAnalyseLoop = True
            analyseData[8] = cache
        cache = optArgs.get('timezoneOffset', None)
        if cache is not None:
-            sqlList.append('[ccn_timezoneOffset] = ?')
+            sqlList.append('[timezone_offset] = ?')
            argumentsList.append(cache)
            reAnalyseLoop = True
            analyseData[7] = cache

        if reAnalyseLoop:
            # re-compute loop data and upload it into list
-            sqlList.append('[ccn_loopDateTimeStart] = ?')
+            sqlList.append('[loop_date_time_start] = ?')
            argumentsList.append(analyseData[5])
-            sqlList.append('[ccn_loopDateTimeEnd] = ?')
+            sqlList.append('[loop_date_time_end] = ?')
            argumentsList.append(str(dt.ResolveLoopStr(
                analyseData[8],
                analyseData[5],
@@ -302,7 +302,7 @@ class CalendarDatabase:

        # execute
        argumentsList.append(uuid)
-        self.cursor.execute('UPDATE calendar SET {} WHERE [ccn_uuid] = ?;'.format(', '.join(sqlList)), 
+        self.cursor.execute('UPDATE calendar SET {} WHERE [uuid] = ?;'.format(', '.join(sqlList)), 
        tuple(argumentsList))
        if self.cursor.rowcount != 1:
            raise Exception('Fail to update due to no matched rows or too much rows.')
@@ -336,7 +336,7 @@ class CalendarDatabase:
    @SafeDatabaseOperation
    def calendar_delete(self, token, uuid, lastChange):
        self.tokenOper_check_valid(token)
-        self.cursor.execute('DELETE FROM calendar WHERE [ccn_uuid] = ? AND [ccn_lastChange] = ?;', (uuid, lastChange))
+        self.cursor.execute('DELETE FROM calendar WHERE [uuid] = ? AND [last_change] = ?;', (uuid, lastChange))
        if self.cursor.rowcount != 1:
            raise Exception('Fail to delete due to no matched rows or too much rows.')
        return True
@@ -345,19 +345,19 @@ class CalendarDatabase:
    @SafeDatabaseOperation
    def collection_getFullOwn(self, token):
        username = self.tokenOper_get_username(token)
-        self.cursor.execute('SELECT [ccn_uuid], [ccn_name], [ccn_lastChange] FROM collection WHERE [ccn_user] = ?;', (username, ))
+        self.cursor.execute('SELECT [uuid], [name], [last_change] FROM collection WHERE [user] = ?;', (username, ))
        return self.cursor.fetchall()

    @SafeDatabaseOperation
    def collection_getListOwn(self, token):
        username = self.tokenOper_get_username(token)
-        self.cursor.execute('SELECT [ccn_uuid] FROM collection WHERE [ccn_user] = ?;', (username, ))
+        self.cursor.execute('SELECT [uuid] FROM collection WHERE [user] = ?;', (username, ))
        return tuple(map(lambda x: x[0], self.cursor.fetchall()))

    @SafeDatabaseOperation
    def collection_getDetailOwn(self, token, uuid):
        username = self.tokenOper_get_username(token)
-        self.cursor.execute('SELECT [ccn_uuid], [ccn_name], [ccn_lastChange] FROM collection WHERE [ccn_user] = ? AND [ccn_uuid] = ?;', (username, uuid))
+        self.cursor.execute('SELECT [uuid], [name], [last_change] FROM collection WHERE [user] = ? AND [uuid] = ?;', (username, uuid))
        return self.cursor.fetchone()

    @SafeDatabaseOperation
@@ -374,7 +374,7 @@ class CalendarDatabase:
        self.tokenOper_check_valid(token)

        lastupdate = utils.GenerateUUID()
-        self.cursor.execute('UPDATE collection SET [ccn_name] = ?, [ccn_lastChange] = ? WHERE [ccn_uuid] = ? AND [ccn_lastChange] = ?;', (
+        self.cursor.execute('UPDATE collection SET [name] = ?, [last_change] = ? WHERE [uuid] = ? AND [last_change] = ?;', (
            newname,
            lastupdate,
            uuid,
@@ -388,7 +388,7 @@ class CalendarDatabase:
    def collection_deleteOwn(self, token, uuid, lastChange):
        self.tokenOper_check_valid(token)

-        self.cursor.execute('DELETE FROM collection WHERE [ccn_uuid] = ? AND [ccn_lastChange] = ?;', (
+        self.cursor.execute('DELETE FROM collection WHERE [uuid] = ? AND [last_change] = ?;', (
            uuid,
            lastChange
        ))
@@ -399,7 +399,7 @@ class CalendarDatabase:
    @SafeDatabaseOperation
    def collection_getSharing(self, token, uuid):
        self.tokenOper_check_valid(token)
-        self.cursor.execute('SELECT [ccn_target] FROM share WHERE [ccn_uuid] = ?;', (uuid, ))
+        self.cursor.execute('SELECT [target] FROM share WHERE [uuid] = ?;', (uuid, ))
        return tuple(map(lambda x: x[0], self.cursor.fetchall()))

    @SafeDatabaseOperation
@@ -407,11 +407,11 @@ class CalendarDatabase:
        self.tokenOper_check_valid(token)

        lastupdate = utils.GenerateUUID()
-        self.cursor.execute('UPDATE collection SET [ccn_lastChange] = ?, WHERE [ccn_uuid] = ? AND [ccn_lastChange] = ?;', (lastupdate, uuid, lastChange))
+        self.cursor.execute('UPDATE collection SET [last_change] = ?, WHERE [uuid] = ? AND [last_change] = ?;', (lastupdate, uuid, lastChange))
        if self.cursor.rowcount != 1:
            raise Exception('Fail to delete due to no matched rows or too much rows.')

-        self.cursor.execute('DELETE FROM share WHERE [ccn_uuid] = ? AND [ccn_target] = ?;', (uuid, target))
+        self.cursor.execute('DELETE FROM share WHERE [uuid] = ? AND [target] = ?;', (uuid, target))
        if self.cursor.rowcount != 1:
            raise Exception('Fail to delete due to no matched rows or too much rows.')

@@ -422,11 +422,11 @@ class CalendarDatabase:
        self.tokenOper_check_valid(token)

        lastupdate = utils.GenerateUUID()
-        self.cursor.execute('UPDATE collection SET [ccn_lastChange] = ? WHERE [ccn_uuid] = ? AND [ccn_lastChange] = ?;', (lastupdate, uuid, lastChange))
+        self.cursor.execute('UPDATE collection SET [last_change] = ? WHERE [uuid] = ? AND [last_change] = ?;', (lastupdate, uuid, lastChange))
        if self.cursor.rowcount != 1:
            raise Exception('Fail to delete due to no matched rows or too much rows.')

-        self.cursor.execute('SELECT * FROM share WHERE [ccn_uuid] = ? AND [ccn_target] = ?;', (uuid, target))
+        self.cursor.execute('SELECT * FROM share WHERE [uuid] = ? AND [target] = ?;', (uuid, target))
        if len(self.cursor.fetchall()) != 0:
            raise Exception('Fail to insert duplicated item.')
        self.cursor.execute('INSERT INTO share VALUES (?, ?);', (uuid, target))
@@ -436,29 +436,29 @@ class CalendarDatabase:
    @SafeDatabaseOperation
    def collection_getShared(self, token):
        username = self.tokenOper_get_username(token)
-        self.cursor.execute('SELECT collection.ccn_uuid, collection.ccn_name, collection.ccn_user \
+        self.cursor.execute('SELECT collection.uuid, collection.name, collection.user \
                FROM share INNER JOIN collection \
-                ON share.ccn_uuid = collection.ccn_uuid \
-                WHERE share.ccn_target = ?;', (username, ))
+                ON share.uuid = collection.uuid \
+                WHERE share.target = ?;', (username, ))
        return self.cursor.fetchall()

    # =============================== todo
    @SafeDatabaseOperation
    def todo_getFull(self, token):
        username = self.tokenOper_get_username(token)
-        self.cursor.execute('SELECT * FROM todo WHERE [ccn_belongTo] = ?;', (username, ))
+        self.cursor.execute('SELECT * FROM todo WHERE [belong_to] = ?;', (username, ))
        return self.cursor.fetchall()

    @SafeDatabaseOperation
    def todo_getList(self, token):
        username = self.tokenOper_get_username(token)
-        self.cursor.execute('SELECT [ccn_uuid] FROM todo WHERE [ccn_belongTo] = ?;', (username, ))
+        self.cursor.execute('SELECT [uuid] FROM todo WHERE [belong_to] = ?;', (username, ))
        return tuple(map(lambda x: x[0], self.cursor.fetchall()))

    @SafeDatabaseOperation
    def todo_getDetail(self, token, uuid):
        username = self.tokenOper_get_username(token)
-        self.cursor.execute('SELECT * FROM todo WHERE [ccn_belongTo] = ? AND [ccn_uuid] = ?;', (username, uuid))
+        self.cursor.execute('SELECT * FROM todo WHERE [belong_to] = ? AND [uuid] = ?;', (username, uuid))
        return self.cursor.fetchone()

    @SafeDatabaseOperation
@@ -482,7 +482,7 @@ class CalendarDatabase:

        # update
        newLastChange = utils.GenerateUUID()
-        self.cursor.execute('UPDATE todo SET [ccn_data] = ?, [ccn_lastChange] = ? WHERE [ccn_uuid] = ? AND [ccn_lastChange] = ?;', (
+        self.cursor.execute('UPDATE todo SET [data] = ?, [last_change] = ? WHERE [uuid] = ? AND [last_change] = ?;', (
            data,
            newLastChange,
            uuid,
@@ -498,7 +498,7 @@ class CalendarDatabase:
        self.tokenOper_check_valid(token)

        # delete
-        self.cursor.execute('DELETE FROM todo WHERE [ccn_uuid] = ? AND [ccn_lastChange] = ?;', (uuid, lastChange))
+        self.cursor.execute('DELETE FROM todo WHERE [uuid] = ? AND [last_change] = ?;', (uuid, lastChange))
        if self.cursor.rowcount != 1:
            raise Exception('Fail to delete due to no matched rows or too much rows.')
        return True
@@ -511,7 +511,7 @@ class CalendarDatabase:
        if not self.tokenOper_is_admin(username):
            raise Exception('Permission denied.')

-        self.cursor.execute('SELECT [ccn_name], [ccn_isAdmin] FROM user;')
+        self.cursor.execute('SELECT [name], [is_admin] FROM user;')
        return tuple(map(lambda x: (x[0], x[1] == 1), self.cursor.fetchall()))

    @SafeDatabaseOperation
@@ -542,16 +542,16 @@ class CalendarDatabase:
        # analyse opt arg
        cache = optArgs.get('password', None)
        if cache is not None:
-            sqlList.append('[ccn_password] = ?')
+            sqlList.append('[password] = ?')
            argumentsList.append(utils.ComputePasswordHash(cache))
        cache = optArgs.get('isAdmin', None)
        if cache is not None:
-            sqlList.append('[ccn_isAdmin] = ?')
+            sqlList.append('[is_admin] = ?')
            argumentsList.append(1 if cache else 0)

        # execute
        argumentsList.append(_username)
-        self.cursor.execute('UPDATE user SET {} WHERE [ccn_name] = ?;'.format(', '.join(sqlList)), 
+        self.cursor.execute('UPDATE user SET {} WHERE [name] = ?;'.format(', '.join(sqlList)), 
        tuple(argumentsList))
        logging.debug(cache)
        logging.debug(tuple(argumentsList))
@@ -566,7 +566,7 @@ class CalendarDatabase:
            raise Exception('Permission denied.')

        # delete
-        self.cursor.execute('DELETE FROM user WHERE [ccn_name] = ?;', (username, ))
+        self.cursor.execute('DELETE FROM user WHERE [name] = ?;', (username, ))
        if self.cursor.rowcount != 1:
            raise Exception('Fail to delete due to no matched rows or too much rows.')
        return True
@@ -580,7 +580,7 @@ class CalendarDatabase:
    @SafeDatabaseOperation
    def profile_changePassword(self, token, newpassword):
        username = self.tokenOper_get_username(token)
-        self.cursor.execute('UPDATE user SET [ccn_password] = ? WHERE [ccn_name] = ?;', (
+        self.cursor.execute('UPDATE user SET [password] = ? WHERE [name] = ?;', (
            utils.ComputePasswordHash(newpassword),
            username
        ))
@@ -590,7 +590,7 @@ class CalendarDatabase:
    def profile_getToken(self, token):
        username = self.tokenOper_get_username(token)

-        self.cursor.execute('SELECT * FROM token WHERE [ccn_user] = ?;', (
+        self.cursor.execute('SELECT * FROM token WHERE [user] = ?;', (
            username,
        ))
        return self.cursor.fetchall()
@@ -600,7 +600,7 @@ class CalendarDatabase:
        _username = self.tokenOper_get_username(token)

        # delete
-        self.cursor.execute('DELETE FROM token WHERE [ccn_user] = ? AND [ccn_token] = ?;', (
+        self.cursor.execute('DELETE FROM token WHERE [user] = ? AND [token] = ?;', (
            _username, 
            deleteToken
        ))