Commit Graph

173 Commits

Author SHA1 Message Date
Finn 54c2b7f64d Added count to test 2017-09-07 13:26:03 +01:00
Finn edac93bef5 Changed deletion method to POST and working test 2017-09-07 13:20:53 +01:00
Finn 8034844cec Merge pull request #50 from Pear-Trading/finn/TransactionViewAPI
Transaction API added
2017-09-06 17:52:56 +01:00
Tom Bloor 2c718e4337 Fix layout issue in upload test and change to using pure json 2017-09-06 16:13:00 +01:00
Finn 4e7c8bbfae Created test and fixed things
Still needs to spit out timezone on the datetime
2017-09-05 17:24:04 +01:00
Tom Bloor cae2806ad2 Merge pull request #44 from Pear-Trading/finn/StopSameOrgPurchase
Stopped Orgs from buying for themselves & added to test
2017-09-05 12:20:25 +01:00
Finn a463b99fa9 Stopped Orgs from buying for themselves & added to test 2017-09-05 12:03:49 +01:00
Tom Bloor 4d21de7bae Improved Graphs and added sales and purchase data graphs.
Includes an API change for development.
2017-09-04 17:29:28 +01:00
Tom Bloor cca27b5475 Fix org graphs test for entity upgrade 2017-08-31 19:12:13 +01:00
Tom Bloor dd6e21eb50 Fix upload tests for entity upgrade 2017-08-31 19:03:49 +01:00
Tom Bloor e91863a3d7 Fixed stats endpoint for leaderboards on entity upgrade 2017-08-31 18:31:42 +01:00
Tom Bloor 96c8fa16c8 fixed resultset_leaderboard schema test for entity changes 2017-08-31 18:28:36 +01:00
Tom Bloor 44c29ad7a2 Fixed leaderboard_trend test for entity upgrade 2017-08-31 18:27:44 +01:00
Tom Bloor 66cc99b975 Fixed schema leaderboard test for entity changes 2017-08-31 18:26:19 +01:00
Tom Bloor 8d205d62c2 Refactor stats test to use fixtures and fix stats endpoints for entity
update
2017-08-31 18:04:51 +01:00
Tom Bloor 2980fd129f Fix search test for entity upgrade 2017-08-31 17:54:25 +01:00
Tom Bloor 1ab2d0b71c Added new search data fixtures 2017-08-31 16:58:23 +01:00
Tom Bloor 4cc8aad367 Fix admin user test for entity upgrade 2017-08-31 16:38:03 +01:00
Tom Bloor 815056b771 Fix error in fixtures data 2017-08-31 16:35:51 +01:00
Tom Bloor 92afe1c531 Fix admin organisation management tests 2017-08-31 14:52:45 +01:00
Tom Bloor 18992784b2 Fix admin login test and required changes for entity upgrade 2017-08-31 13:35:49 +01:00
Tom Bloor 6cd3113912 Updated basic test to use fixtures 2017-08-31 13:21:00 +01:00
Tom Bloor d4ccd0b7a2 Update user fixtures with new entity code 2017-08-31 13:18:04 +01:00
Finn 72813ff2a3 Made image upload optional 2017-08-31 11:41:38 +01:00
Tom Bloor 3bb18103c9 Remove debug items from graphs test 2017-08-29 12:43:13 +01:00
Tom Bloor 3ae8a43df4 Added organisation graph endpoint and tests 2017-08-29 12:42:27 +01:00
Tom Bloor cc046f517b Added users fixture set 2017-08-25 16:36:43 +01:00
Tom Bloor df7f1de1a6 Merge pull request #37 from Pear-Trading/TBSliver/Login-Info
Added extra info to login return
2017-08-25 16:15:16 +01:00
Finn 6cdc8891c3 Tests fixed 2017-08-25 15:47:54 +01:00
Finn ef2e0627e1 Fixes and schema update stuff 2017-08-25 15:32:39 +01:00
Tom Bloor deba59dc00 Add test for showing display name and user type correctly 2017-08-25 15:17:12 +01:00
Tom Bloor 768cc38410 Refactor api login test 2017-08-25 15:14:43 +01:00
Finn 7c25ecccfd Entry field and test fixed 2017-08-24 12:48:32 +01:00
Finn 9865130666 Added user account stuff test and some fixes 2017-08-23 18:42:19 +01:00
Finn 6f01bf2661 Fixed validation removing redundant code 2017-08-23 16:47:29 +01:00
Tom Bloor 49beb3037d Merge pull request #33 from Pear-Trading/TBSliver/Recalc-Leaderboards
Recalculate Leaderboards
2017-08-21 17:04:26 +01:00
Tom Bloor 2dfce6afd2 Added scripts for generating fixtures - no data stored for now 2017-08-21 15:32:02 +01:00
Tom Bloor 3f743f0b5f Fixed all_day calculating from the wrong time 2017-08-21 15:29:09 +01:00
Finn 573c1ad50a Test renamed and add organisation rest added 2017-08-21 15:18:34 +01:00
Finn 36a5fdf2e3 Fixed code and added test for reading and editing Organisations 2017-08-18 16:46:49 +01:00
Finn efbcdbce84 Added system redundancy 2017-08-14 16:21:06 +01:00
Finn c6726682d4 Leaderboards corrected and fixes 2017-08-14 16:10:14 +01:00
Finn d078a09ccd Added receipt datetime string submission validation & validator test 2017-08-14 15:35:23 +01:00
Finn 65d5bab444 Fixed errors and tests and updated DB 2017-08-14 15:04:24 +01:00
Finn f9703b6561 Updated tests to include receipt datetime submission 2017-08-14 11:55:52 +01:00
Finn 9affdbf08e Removed redundant file and fixed user updat e+ added tests 2017-07-27 14:18:22 +01:00
Tom Bloor b009fa5c86 Remove admin approve and merge tests for removed code 2017-07-25 14:30:42 +01:00
Tom Bloor 5713f03cf2 Fix test
Needed to initialise a leaderboard for monthly stats
2017-07-20 16:41:35 +01:00
Tom Bloor 559e88d9e6 Fix issue with leaderboard position due to wrong calculation of trend 2017-06-13 23:15:10 +01:00
Tom Bloor 2bf595d135 fIx final few tests for age_range to year_of_birth change 2017-06-13 21:28:42 +01:00
Tom Bloor c702956777 fix admin approve and merge tests 2017-06-13 21:23:19 +01:00
Tom Bloor 170a056f37 Fix schema tests from year_of_birth change 2017-06-13 21:11:54 +01:00
Tom Bloor 51617a8cbb Move and fix search test 2017-06-13 21:06:53 +01:00
Tom Bloor cee5a00d18 Rename and fix upload test 2017-06-13 21:05:27 +01:00
Tom Bloor d73ddb6ba2 Remove AgeRange table and first pass of fixing tests 2017-06-13 21:02:24 +01:00
Tom Bloor 9cd9f8079e Add leaderboard stats endpoint and trends 2017-06-06 22:30:02 +01:00
Tom Bloor daeeac811c Change leaderboards to only follow customers 2017-06-05 22:59:31 +01:00
Tom Bloor 5e06f0a69b Added resultset for leaderboard for more consice code 2017-06-05 22:34:48 +01:00
Tom Bloor 7e11fc50bd Added get_latest and test for it on leaderboard 2017-06-05 22:15:27 +01:00
Tom Bloor 2e3bc489ea Finish tests for leaderboard schema output 2017-05-23 23:16:56 +01:00
Tom Bloor bc12dbf8b0 Added leaderboard first pass stuff 2017-05-23 23:06:07 +01:00
Tom Bloor 00e98f874a Get sums to show 0 instead of undef for no data 2017-05-22 22:21:05 +01:00
Tom Bloor 9586d1a637 Add more stats to default stat set 2017-05-16 22:45:49 +01:00
Tom Bloor a680d7b9df Remove today_avg as redundant due to other data 2017-05-16 21:46:44 +01:00
Tom Bloor 86955c0d1c Started with basic today stats 2017-05-16 21:30:38 +01:00
Tom Bloor ae6884202a Fixed issue with postcode validator 2017-04-25 23:33:35 +01:00
Tom Bloor aed22d1c98 Change to having display_name and full_name for customers 2017-04-25 21:44:13 +01:00
Tom Bloor 286ecf11e1 Fixed issue with validator for postcodes 2017-04-25 20:50:34 +01:00
piratefinn a4ce60407e Did test and routing fixes and dependency fix 2017-04-24 17:42:07 +01:00
Tom Bloor fad90980f6 Removed unnecessary code and test 2017-04-23 17:02:01 +01:00
Tom Bloor 1598909958 Started on user day entry 2017-04-23 16:59:35 +01:00
Tom Bloor 1d1b4aa1cf Change registration to be the same as the api docs 2017-04-22 19:35:19 +01:00
Tom Bloor 3be6289fc3 Finish major rework of schema 2017-04-21 22:12:53 +01:00
Tom Bloor dd7862d93d Refactored AccountToken table 2017-04-21 21:28:50 +01:00
Tom Bloor f69b06bda2 Refactored customer table and fixed all tests form that 2017-04-21 21:20:47 +01:00
Tom Bloor d0cbb215d8 refactor user table and setup timestamp auto setting 2017-04-21 20:52:14 +01:00
Tom Bloor 786b69f54d Fix and refactor search test 2017-04-21 17:23:41 +01:00
Tom Bloor 4a379ed76d Fixed registration test after refactoring 2017-04-21 14:57:04 +01:00
Tom Bloor b48edea9fb Fixed admin-merge test after refactoring 2017-04-21 14:54:19 +01:00
Tom Bloor 9bc38c85ea Fixed upload test after refactoring 2017-04-21 14:16:48 +01:00
Tom Bloor c40a480361 Refactored Pending and Valid orgs and admin-approve test 2017-04-21 14:14:51 +01:00
Tom Bloor 99ef319c3b Started refactoring pending orgs table 2017-04-21 12:42:31 +01:00
Tom Bloor 718d5f002e Merge branch 'development' into TBSliver/Receipt-Upload 2017-04-20 22:17:58 +01:00
Tom Bloor 6596fd10aa Refactor Organisation table to easier column names 2017-04-20 22:17:13 +01:00
piratefinn 2ea55daf33 Fixed texts now with strict# Please enter the commit message for your changes. Lines starting 2017-04-20 18:15:34 +01:00
Tom Bloor 7f18aa7173 Refactor upload API to easier to read variables 2017-04-20 12:33:56 +01:00
Tom Bloor ab9bfdf221 Attempted fix for user-history, skipping tests as needs major refactor
of code
2017-04-20 02:18:01 +01:00
Tom Bloor 42a3103958 Fixed search test after session_key refactoring 2017-04-20 02:04:13 +01:00
Tom Bloor 9dcfea95d7 Fixed admin-merge test after upload and session_key refactor 2017-04-20 02:01:39 +01:00
Tom Bloor 7eec666141 Fixed admin-approve tests after upload updates 2017-04-20 01:49:34 +01:00
Tom Bloor 94583f61bf Refactored entire api auth code, and upload endpoint 2017-04-20 01:27:18 +01:00
Tom Bloor 9974e6f07e Fixed user-history test with session refactor 2017-04-19 00:20:39 +01:00
Tom Bloor de5e812950 Fix search tests from session refactor 2017-04-19 00:10:14 +01:00
Tom Bloor 4f892d19e7 fix basic test 2017-04-19 00:06:30 +01:00
Tom Bloor 03dc114236 Fixed admin-merge test after session refactoring 2017-04-19 00:03:25 +01:00
Tom Bloor 576966ba4c Fix admin approve test after session key changes 2017-04-18 23:50:19 +01:00
Tom Bloor 110a051a4e Fixed upload test and controller after updates to session key usage 2017-04-18 23:43:49 +01:00
Tom Bloor f01a7a9439 Fixed admin login test after refactoring 2017-04-18 22:48:00 +01:00
Tom Bloor 5a1c6b0015 Removed all unneeded helpers from main codebase and removed deprecated
test
2017-04-18 22:44:59 +01:00
Tom Bloor 68b66d431c Reworked api login to just need a session_key for everything 2017-04-18 22:31:08 +01:00