github.com/ClimateMind/climatemind-backend commits

lint after resolving merge conflicts

0b5d374803082ed8a31e6ed2fd4f5ac820946d35 authored over 2 years ago by Yasmine Himanen <[email protected]>

Merge branch 'develop' into cm-921-shared-impacts-personalisation

9e9ca6329479a75ebc981877a58a6ee0854f9490 authored over 2 years ago by y-himanen <[email protected]>

commit to pull latest changes

ee074d9cba84bd6ef99b7587c491840bf1914590 authored over 2 years ago by Yasmine Himanen <[email protected]>

PersonalValues order reverted

9131cae1ec23ac199b759abc9c4ad2c11f8e09cf authored over 2 years ago by danmash <[email protected]>

Merge pull request #308 from ClimateMind/CM-923-improve-recommended-solutions

Cm 923 improve recommended solutions

1f75f90f02c5b856c4193597be88ee6aa6fe10b9 authored over 2 years ago by Cyprian Laskowski <[email protected]>

Merge branch 'cm-921-shared-impacts-personalisation' of https://github.com/ClimateMind/climatemind-backend into cm-921-shared-impacts-personalisation

5e4925efcb11c30af554d974bfeaf5e81d6ff9ea authored over 2 years ago by Yasmine Himanen <[email protected]>

commit to pull

823d837c17323c225c5cc1eba5a19971200bcf67 authored over 2 years ago by Yasmine Himanen <[email protected]>

Merge branch 'develop' into cm-921-shared-impacts-personalisation

9d3f20f3d4ccc0025da9cf0abefcdad49b886cfb authored over 2 years ago by Kameron Rodrigues <[email protected]>

Merge branch 'develop' into CM-923-improve-recommended-solutions

63f881efd3cf64a65ee6794034e2513a10dc2518 authored over 2 years ago by Kameron Rodrigues <[email protected]>

CM-1020 email module unit&integration tests, one function moved to email module

265f48e5d2850b296ec60d6f8aaecd30dd7f228b authored over 2 years ago by danmash <[email protected]>

Merge branch 'develop' of https://github.com/ClimateMind/climatemind-backend into cm-921-shared-impacts-personalisation

5ef01942084fde795d39e3e75885628390ca9e0e authored over 2 years ago by Yasmine Himanen <[email protected]>

save commit to pull

7c7da6822bad0761ed5f6295df8479b8c15fd77a authored over 2 years ago by Yasmine Himanen <[email protected]>

Merge branch 'develop' into cm-921-shared-impacts-personalisation

5ec0af3f8b2f036cd57fa57c27fc24b1412d7555 authored over 2 years ago by y-himanen <[email protected]>

shared impacts personalisation with agreed limited scope

8360ca8bbb650d4d8e829555257f8361d6a6d9c3 authored over 2 years ago by Yasmine Himanen <[email protected]>

CM-998 sessions module refactoring and unit & integration tests added.

ce8c2e26ff7c3a994020535117f15303d96467b2 authored over 2 years ago by danmash <[email protected]>

Bump numpy from 1.19.0 to 1.21.0

Bumps [numpy](https://github.com/numpy/numpy) from 1.19.0 to 1.21.0.
- [Release notes](https://g...

ccc8528a29771a7515e9d2810249010fd0617196 authored over 2 years ago by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

CM-998 pytest-factoryboy replaced with vanilla factoryboy due to annoying unstable compatibility with PyCharm IDE and disputable features

7392c338dfb14d67767d85b005eeda00a5fb4e6d authored over 2 years ago by danmash <[email protected]>

CM-998 unit tests optimization and pytest-xdist support added. Run pytest in parallel with `pytest -n auto`

36db47827c3608a88f7adab927e85170cf060b56 authored over 2 years ago by danmash <[email protected]>

CM-998 base setup of unit tests DB, pytest-flask-sqlalchemy and pytest-factoryboy with tests

05a3660077feaadb181fbe1307faa256f03495b4 authored over 2 years ago by danmash <[email protected]>

Merge branch 'develop' into CM-923-improve-recommended-solutions

87b2efa114a99f7c269c6431d62a0282dcdde32f authored over 2 years ago by Kameron Rodrigues <[email protected]>

Merge branch 'develop' of https://github.com/ClimateMind/climatemind-backend into cm-921-shared-impacts-personalisation

92a79bbd0a793431e130ce7cd82e90281c433f9f authored over 2 years ago by Yasmine Himanen <[email protected]>

mid-way commit

4ad2e58d7136d2c1c5bfe376d1dcebcc4bb782e7 authored over 2 years ago by Yasmine Himanen <[email protected]>

CM-923: updated docstring and actually used parameters

e8f691b549374f0c83cd9a6876a6423c700d20a6 authored over 2 years ago by Cyprian Laskowski <[email protected]>

CM-923: minor improvements

2afdce24d782df791957392878f47c1da256059c authored over 2 years ago by Cyprian Laskowski <[email protected]>

lint

147ba1ff5bb5ad98baf05a7b561858c0d41ef45b authored over 2 years ago by Cyprian Laskowski <[email protected]>

Merge branch 'develop' into CM-923-improve-recommended-solutions

252ce3095e8d995f6599f96eb55a711a128d5fca authored over 2 years ago by Cyprian Laskowski <[email protected]>

Merge pull request #304 from ClimateMind/value_types

PersonalValue enum added

af33ae48f6a6348f3eba75c09c3f7bb8893ba9ef authored over 2 years ago by y-himanen <[email protected]>

CM-998 PersonalValue enum added

d2cea4cba7b8a2ef64ba0142cd7bf111f0e112a6 authored over 2 years ago by danmash <[email protected]>

Improved alignment feed solution assignment

47290d1793199a6af4dc71800ab2cfb1d4d73988 authored over 2 years ago by Cyprian Laskowski <[email protected]>

Partly implemented improved solution recommendations

97affe749d2878b783a7791bac15ebe25dc12386 authored over 2 years ago by Cyprian Laskowski <[email protected]>

Merge pull request #303 from ClimateMind/CM-931-personalise-alignment-matching

Cm 931 personalise alignment matching

f45ec3e7aaf7bf4f6ba48723709224df77cb1c7a authored almost 3 years ago by Kameron Rodrigues <[email protected]>

Expanded a docstring

7bd6b8df150ad828dddf38023142b67eafeb5368 authored almost 3 years ago by Cyprian Laskowski <[email protected]>

lint

5c981d7530fad5e337b4db60e1c57bbd3002b500 authored almost 3 years ago by Kameron Rodrigues <[email protected]>

test

test to check github circle ci test status updates

a643a521bf0a4336df039739884c073d0dd55855 authored almost 3 years ago by Kameron Rodrigues <[email protected]>

Fixed rounding of top match percent

ca68f20d6559d146de4a1bd96a3d559f2d7c3df8 authored almost 3 years ago by Cyprian Laskowski <[email protected]>

Removed password route mistakenly included prematurely

2406271c88869aea60a489c90a57baf374b8f913 authored almost 3 years ago by Cyprian Laskowski <[email protected]>

Ran black linter

3eb98abe4d1021411d1a32930f34c09207ebf868 authored almost 3 years ago by Cyprian Laskowski <[email protected]>

Added a few unit tests

3d0667bdcd6058a35c88671a01fa2c3fce780735 authored almost 3 years ago by Cyprian Laskowski <[email protected]>

Broke code down into smaller functions and added basic docstrings

0ca3a997a6a5f591466d5dc7548213ed9b96affe authored almost 3 years ago by Cyprian Laskowski <[email protected]>

Merged develop into CM-931-personalise-alignment-matching (and resolved merge conflicts)

19a326e84f1113ea6e853fa1f9a33283953722a3 authored almost 3 years ago by Cyprian Laskowski <[email protected]>

Merge pull request #302 from ClimateMind/CM-943-personalise-overall-similarity-score

use kendal tau-b for similarity score calculation

d75a373a811d8ed01435846d2b7cdb5d50e005a0 authored almost 3 years ago by y-himanen <[email protected]>

Merge branch 'develop' into CM-943-personalise-overall-similarity-score

3c86113043093781aa3b882010acdbfde88e9e88 authored almost 3 years ago by y-himanen <[email protected]>

use kendal tau-b for similarity score calculation

f6640ac33416295fec26228661bd0ccc29f768b6 authored almost 3 years ago by Yasmine Himanen <[email protected]>

UT check post code added

9e6da486608594c044b8285a0a4d7ac10d68d3f9 authored almost 3 years ago by danmash <[email protected]>

Mostly implemented calculation of alignment matching

7af23cf34b553859d70e2189f1de1b46ff9d8073 authored almost 3 years ago by Cyprian Laskowski <[email protected]>

Moved utils function and tweaked rounding

76b5542497cfe69710f661da38407c61d6fd9b6d authored almost 3 years ago by Cyprian Laskowski <[email protected]>

Fixed math bug

8cf37ae93d00a7b61ab72419b8b2161250b92449 authored almost 3 years ago by Kameron Rodrigues <[email protected]>

change positivity constant to 6

93791ee575daa9f39205048bfff5cc19dc978b80 authored almost 3 years ago by Kameron Rodrigues <[email protected]>

Merge branch 'develop' into dependabot/pip/pillow-9.0.1

d69ab2e485230551bb9a4305aafc9a98927bec49 authored almost 3 years ago by Kameron Rodrigues <[email protected]>

Merge pull request #299 from ClimateMind/CM-995-alignment-summary

get alignment summary endpoint added

ca473341cf155f48c1b758819b0f607bbc883e7d authored almost 3 years ago by y-himanen <[email protected]>

solving merge conflicts

cb1d33864246e80d7eb03090487253b025a421c3 authored almost 3 years ago by Yasmine Himanen <[email protected]>

Merge branch 'develop' into CM-995-alignment-summary

678c3dcd09758807c3e0e41d3ea8b2e6bbd634b9 authored almost 3 years ago by y-himanen <[email protected]>

moved iri title function to nx utils for consistency

82c867e160a37cf5dd854ad1c45c0ba088fe90e9 authored almost 3 years ago by Yasmine Himanen <[email protected]>

Merge pull request #298 from ClimateMind/CM-993-CM-994-learn-more

added get details endpoints for shared solutions and shared impacts a…

1ff092c1010c4afa5a5e693656837dcf8f856bd9 authored almost 3 years ago by y-himanen <[email protected]>

refactoring solution type checking

ad0f19570609650e88c018868d0c5bfe9aaab648 authored almost 3 years ago by Yasmine Himanen <[email protected]>

added check if solution is mitigation or adaptation, changed criteria to check that iri is of correct type, i.e. not solution when looking for impact and vice versa

35f8a336455bd8586c10713008361161f613f6e7 authored almost 3 years ago by Yasmine Himanen <[email protected]>

get alignment summary endpoint added

53e0defce8f583a101053879d1077f3f93c51c7d authored almost 3 years ago by Yasmine Himanen <[email protected]>

added get details endpoints for shared solutions and shared impacts and updateed the user b event endpoint to include more event types

c9a62253b86b0b7c964e06cc7e5bed561a87130e authored almost 3 years ago by Yasmine Himanen <[email protected]>

Bump pillow from 8.3.2 to 9.0.1

Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.3.2 to 9.0.1.
- [Release notes](h...

50813052fb768132327dc1e3d252df19b830047b authored almost 3 years ago by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Merge pull request #296 from ClimateMind/CM-883-CM-895-shared-solutions-selection

Cm 883 cm 895 shared solutions selection

413372cc9d9cffd88d806afa5db55b268823e755 authored almost 3 years ago by y-himanen <[email protected]>

reran black after solving merge conflicts

f1d5a0d2eb2a0d63564f428974f35b8a38daed8e authored almost 3 years ago by Yasmine Himanen <[email protected]>

Merge branch 'develop' into CM-883-CM-895-shared-solutions-selection

cce83f7e99f4b6707cd2cb6817c735e88bb6f4d6 authored almost 3 years ago by y-himanen <[email protected]>

Merge pull request #295 from ClimateMind/CM-957-CM-960-shared-impact-selection

post shared impact selection endpoint added

7cc442f5e31f32f066bd93d21f4e0d8539288f57 authored almost 3 years ago by y-himanen <[email protected]>

Merge branch 'develop' into CM-883-CM-895-shared-solutions-selection

0fa70cc133765842d6ee97acc723977598388554 authored almost 3 years ago by y-himanen <[email protected]>

Merge branch 'develop' into CM-957-CM-960-shared-impact-selection

efa697e4909e6e5ee9cf2b4f5f4ceb0073d5714d authored almost 3 years ago by y-himanen <[email protected]>

CM-989 test_process_scores added

4bcbbb5c007f23d9d34ff8b596cf15f2c4c2a03d authored almost 3 years ago by danmash <[email protected]>

Extra tests

8efa66fa7fcd9603240ffdf46cb8c4d9bbd76121 authored almost 3 years ago by Kameron Rodrigues <[email protected]>

CM-989 predefined answers for test_process_scores

64b2003789fdd3e4e999a092888c1b0b0a79e126 authored almost 3 years ago by danmash <[email protected]>

Lint and doc string documentation

a76180a6d98f274d0261c0f4a5245b495dfcfa9b authored almost 3 years ago by Kameron Rodrigues <[email protected]>

CM-989 pytest initial setup with coverage

ea1673aed11e63d7a774a3e3b892213aea9c1eb3 authored almost 3 years ago by danmash <[email protected]>

post shared solutions endpoint added

ef267421887613842e54e8d8e0c13566b41885fd authored almost 3 years ago by Yasmine Himanen <[email protected]>

post shared impact selection endpoint added

e2b88437073d610a0e69d30595f064638b88e8e8 authored almost 3 years ago by Yasmine Himanen <[email protected]>

Type fix

f651725b2d4d5b381dec6f63907be5ecf437d58d authored almost 3 years ago by Kameron Rodrigues <[email protected]>

Merge pull request #293 from ClimateMind/fix-email-previews

edited preview text on emails

50c056c08f170f7bcda76810e7ec2424fdd5c3cd authored almost 3 years ago by y-himanen <[email protected]>

edited preview text on emails

af393fb89ddfb9e5df51426525e0eb2b2e6f301e authored almost 3 years ago by Yasmine Himanen <[email protected]>

Merge pull request #292 from ClimateMind/CM-875-sharing-email

confirmation email for user b consented to share with user a. small f…

6773498d3129bf177c1eb9d66eefc36f807d94ca authored almost 3 years ago by y-himanen <[email protected]>

confirmation email for user b consented to share with user a. small fix for welcome email to remove 'view this email in the browser' text

64a9f45595aa400c4a89971883f0b4c0c3358101 authored almost 3 years ago by Yasmine Himanen <[email protected]>

Merge pull request #289 from ClimateMind/CM-864-welcome-email

sendgrid integrated, welcome email set up with approved design

123bab86dc031dad6264a5d8b73a7962cf964ae1 authored almost 3 years ago by y-himanen <[email protected]>

Merge branch 'develop' into CM-864-welcome-email

dab4658cb4638159c4880943b1b8874aa3a8e811 authored almost 3 years ago by y-himanen <[email protected]>

Merge pull request #290 from ClimateMind/CM-909-consent

consent endpoint created to update user b's consent choices in db

f20e934269783087230229836fe8c80b283b9f18 authored almost 3 years ago by y-himanen <[email protected]>

Merge branch 'CM-864-welcome-email' of https://github.com/ClimateMind/climatemind-backend into CM-864-welcome-email

73c5822467ee9109122ad6eb7c74c0ae50b54131 authored almost 3 years ago by Yasmine Himanen <[email protected]>

added missing docstring

40e9ffd1b6b35f6cb63ba6cdd448fc90e8815ea4 authored almost 3 years ago by Yasmine Himanen <[email protected]>

consent endpoint created to update user b's consent choices in db

a2a6d28ce1d4e7bd2e0589be5c490d12acde4085 authored almost 3 years ago by Yasmine Himanen <[email protected]>

Merge branch 'develop' into CM-864-welcome-email

d06eaeb050ffede6117b1110084d5fb366d337a9 authored almost 3 years ago by y-himanen <[email protected]>

sendgrid integrated, welcome email set up with approved design

06a702769eece31b2622223515ad8115bdebaf0f authored almost 3 years ago by Yasmine Himanen <[email protected]>

Merge pull request #288 from ClimateMind/CM-987-increase-platform-accessibility

Cm-987 increase platform accessibility

a752976046624ecebd6dfbeee67f06ff3a12c9a3 authored almost 3 years ago by Kameron Rodrigues <[email protected]>

CM-987 docker for m1

9ff7e300322a04b21e030c35f837c9726b1fca5f authored almost 3 years ago by danmash <[email protected]>

CM-987 docker-compose.yml reverted

20fc2c5bddeb3b23f602a5ce1549da1233786d94 authored almost 3 years ago by danmash <[email protected]>

CM-987 docker-compose.m1.yml added

412ce25ade965c35f27cd798fbddadf4bceb123e authored almost 3 years ago by danmash <[email protected]>

Platform compatibility increase

This should not decrease compatibility across the team, if it does,
then a more flexible code ne...

b864906e5e7a87d97fd2a8cbc32537229933e4b6 authored almost 3 years ago by Kameron Rodrigues <[email protected]>

Removed redundancies and removed unnecessary components

62102df6003c4297073262b349e2552fbeba8123 authored almost 3 years ago by Kameron Rodrigues <[email protected]>

Lint

6f9f4a2d6c46cf8696637d567fefbd8930bfb872 authored almost 3 years ago by Kameron Rodrigues <[email protected]>

Working on non-M1 Mac

To work on M1 will need to do the following when running:
-use docker buildx command
-use the ri...

017161915b4158b2c34f980aa3390c51448b56d8 authored almost 3 years ago by Kameron Rodrigues <[email protected]>

CM-987 WIP

e706aeeb8040e432a12e9463775592ae3c9e842e authored almost 3 years ago by danmash <[email protected]>

CM-987 azure-sql-edge:1.0.5 used

58d398be6de36d71599e1f2dac4cb8159ef8b1d8 authored almost 3 years ago by danmash <[email protected]>

Merge pull request #287 from ClimateMind/CM-958-CM-962-get-shared-solutions

added get shared solutions endpoint. edited docstring and added comme…

66c3fbae8fa85e229199f1b43b291456a5d8a973 authored almost 3 years ago by y-himanen <[email protected]>

added get shared solutions endpoint. edited docstring and added comment for hardcoded values in shared impacts code

e4de9097416017b0d9f347b5b255c609ae0d2edd authored almost 3 years ago by Yasmine Himanen <[email protected]>

Merge pull request #286 from ClimateMind/CM-865-CM-919-get-alignment-2

Included all value properties from json

f1a0d3725f5243dfd1c4a73e4a2697eb2187697a authored almost 3 years ago by y-himanen <[email protected]>

Included all value properties from json

7e60a70e3dbc728248eeb8b22ebab0543addf21c authored almost 3 years ago by Cyprian Laskowski <[email protected]>

Merge pull request #285 from ClimateMind/CM-882-CM-892-get-shared-impacts

Cm 882 cm 892 get shared impacts

0e944a54fcfc5b4692b1c2e1cc2f9c1d18e42e9d authored almost 3 years ago by y-himanen <[email protected]>

Ecosyste.ms: OpenCollective

github.com/ClimateMind/climatemind-backend