Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move to production #4075

Merged
merged 11 commits into from
Dec 13, 2024
Merged

move to production #4075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f03fc23
Update auth service staging image tag to stage-9267ecdf-1734100799
github-actions[bot] Dec 13, 2024
6516f05
Update AirQo exceedance production image tag to prod-455774ec-1734100845
github-actions[bot] Dec 13, 2024
240319f
Update KCCA exceedance production image tag to prod-455774ec-1734100845
github-actions[bot] Dec 13, 2024
0096c5e
Update auth service production image tag to prod-455774ec-1734100845
github-actions[bot] Dec 13, 2024
b14203e
Update website production image tag to prod-455774ec-1734100845
github-actions[bot] Dec 13, 2024
a2b3c0f
Update analytics production image tag to prod-455774ec-1734100845
github-actions[bot] Dec 13, 2024
308407b
Update predict production image tag to prod-455774ec-1734100845
github-actions[bot] Dec 13, 2024
01199ff
consider removal of duplicates of all fields and not just selected_sites
Baalmart Dec 13, 2024
5bca028
Update spatial production image tag to prod-455774ec-1734100845
github-actions[bot] Dec 13, 2024
f73622d
restoring the duplicate removal functionality
Baalmart Dec 13, 2024
4437d7f
Merge pull request #4074 from airqo-platform/hf-prefs-update-3
Baalmart Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion k8s/analytics/values-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ images:
celeryWorker: eu.gcr.io/airqo-250220/airqo-analytics-celery-worker
reportJob: eu.gcr.io/airqo-250220/airqo-analytics-report-job
devicesSummaryJob: eu.gcr.io/airqo-250220/airqo-analytics-devices-summary-job
tag: prod-77f19000-1734097532
tag: prod-455774ec-1734100845
api:
name: airqo-analytics-api
label: analytics-api
Expand Down
2 changes: 1 addition & 1 deletion k8s/auth-service/values-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ app:
replicaCount: 3
image:
repository: eu.gcr.io/airqo-250220/airqo-auth-api
tag: prod-77f19000-1734097532
tag: prod-455774ec-1734100845
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
Expand Down
2 changes: 1 addition & 1 deletion k8s/auth-service/values-stage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ app:
replicaCount: 2
image:
repository: eu.gcr.io/airqo-250220/airqo-stage-auth-api
tag: stage-c701f88b-1734080836
tag: stage-9267ecdf-1734100799
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
Expand Down
2 changes: 1 addition & 1 deletion k8s/exceedance/values-prod-airqo.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ app:
configmap: env-exceedance-production
image:
repository: eu.gcr.io/airqo-250220/airqo-exceedance-job
tag: prod-77f19000-1734097532
tag: prod-455774ec-1734100845
nameOverride: ''
fullnameOverride: ''
2 changes: 1 addition & 1 deletion k8s/exceedance/values-prod-kcca.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ app:
configmap: env-exceedance-production
image:
repository: eu.gcr.io/airqo-250220/kcca-exceedance-job
tag: prod-77f19000-1734097532
tag: prod-455774ec-1734100845
nameOverride: ''
fullnameOverride: ''
2 changes: 1 addition & 1 deletion k8s/predict/values-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ images:
predictJob: eu.gcr.io/airqo-250220/airqo-predict-job
trainJob: eu.gcr.io/airqo-250220/airqo-train-job
predictPlaces: eu.gcr.io/airqo-250220/airqo-predict-places-air-quality
tag: prod-77f19000-1734097532
tag: prod-455774ec-1734100845
api:
name: airqo-prediction-api
label: prediction-api
Expand Down
2 changes: 1 addition & 1 deletion k8s/spatial/values-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ app:
replicaCount: 3
image:
repository: eu.gcr.io/airqo-250220/airqo-spatial-api
tag: prod-77f19000-1734097532
tag: prod-455774ec-1734100845
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
Expand Down
2 changes: 1 addition & 1 deletion k8s/website/values-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ app:
replicaCount: 3
image:
repository: eu.gcr.io/airqo-250220/airqo-website-api
tag: prod-77f19000-1734097532
tag: prod-455774ec-1734100845
nameOverride: ''
fullnameOverride: ''
podAnnotations: {}
Expand Down
12 changes: 3 additions & 9 deletions src/auth-service/utils/create-preference.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,7 @@ const prepareUpdate = (body, fieldsToUpdate, fieldsToAddToSet) => {
: [update[field]];

// Remove duplicates for specific fields
const uniqueArray =
field === "selected_sites"
? removeDuplicates(processedArray)
: processedArray;

const uniqueArray = removeDuplicates(processedArray);
update["$set"] = update["$set"] || {};
update["$set"][field] = uniqueArray;
delete update[field];
Expand All @@ -97,10 +93,7 @@ const prepareUpdate = (body, fieldsToUpdate, fieldsToAddToSet) => {
}));

// Remove duplicates for specific fields
const uniqueArray =
field === "selected_sites"
? removeDuplicates(processedArray)
: processedArray;
const uniqueArray = removeDuplicates(processedArray);

update["$set"] = update["$set"] || {};
update["$set"][field] = uniqueArray;
Expand Down Expand Up @@ -393,6 +386,7 @@ const preferences = {
}

const update = prepareUpdate(body, fieldsToUpdate, fieldsToAddToSet);

const options = { upsert: true, new: true };

const modifyResponse = await PreferenceModel(tenant).findOneAndUpdate(
Expand Down
Loading