Skip to content

Commit a8ef0e4

Browse files
committed
refactor list orderation
1 parent 80e8f7b commit a8ef0e4

File tree

3 files changed

+30
-26
lines changed

3 files changed

+30
-26
lines changed

.env

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
# Server config
2-
API_LOGGING=false
3-
API_VERSION=10
4-
5-
# API Keys
6-
API_ACCESS_KEY=
7-
API_SECRET_KEY=
8-
9-
# OAuth
10-
OAUTH_CLIENT_ID=
11-
OAUTH_CLIENT_SECRET=
12-
SESSION_SECRET=literallyAnythingWillDont
13-
14-
NODE_ENV=development
15-
FIRESTORE_EMULATOR_HOST=127.0.0.1:8080
1+
# Server config
2+
API_LOGGING=false
3+
API_VERSION=10
4+
5+
# API Keys
6+
API_ACCESS_KEY=
7+
API_SECRET_KEY=
8+
9+
# OAuth
10+
OAUTH_CLIENT_ID=
11+
OAUTH_CLIENT_SECRET=
12+
SESSION_SECRET=literallyAnythingWillDont
13+
14+
NODE_ENV=development
15+
FIRESTORE_EMULATOR_HOST=127.0.0.1:8080

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -200,4 +200,5 @@ app.yaml
200200
.fs_code/
201201
.storage/
202202
credentials/
203-
temp/
203+
temp/
204+
.env

backend/endpoints/references.py

+13-10
Original file line numberDiff line numberDiff line change
@@ -173,34 +173,37 @@ def get_linked_parents(db, instance):
173173
curr_node_parents = get_linked_parents(db, curr_node)
174174

175175
for parent in curr_node_parents:
176-
if parent in sorted_list:
177-
sorted_list.remove(parent)
178-
sorted_list.append(parent)
179-
elif parent not in unvisited_nodes:
176+
if parent not in unvisited_nodes:
180177
unvisited_nodes.append(parent)
178+
179+
trimmed_list = [] #remove duplicates
180+
181+
for instance in reversed(sorted_list):
182+
if instance not in trimmed_list:
183+
trimmed_list.insert(0,instance)
181184

182185
with open("backend/endpoints/logfile.txt", "a") as log_file:
183186

184187
log_file.write("curr_instance begin\n")
185188
log_file.write(f"{curr_instance}\n")
186189
log_file.write("curr_instance end\n\n")
187190

188-
log_file.write("sorted_list begin\n")
189-
for node in sorted_list:
191+
log_file.write("trimmed_list begin\n")
192+
for node in trimmed_list:
190193
log_file.write(f"{documents.get_document(api, node)["name"]}\n")
191-
log_file.write("sorted_list end\n\n")
194+
log_file.write("trimmed_list end\n\n")
192195

193196

194-
for instance in sorted_list:
197+
for instance in trimmed_list:
195198
require_permissions(api, instance, Permission.WRITE , Permission.LINK)
196199

197200
versions.create_version(api, curr_instance, name, description)
198201

199202
updated_references = 0
200-
for update_instance in sorted_list:
203+
for update_instance in trimmed_list:
201204

202205
updated_references += do_update_references(
203-
api, update_instance, [doc.document_id for doc in sorted_list]
206+
api, update_instance, [doc.document_id for doc in trimmed_list]
204207
)
205208
versions.create_version(api, update_instance, name, description)
206209

0 commit comments

Comments
 (0)