Commit graph

453 commits

Author SHA1 Message Date
Bradley M. Kuhn
10030b3488 _verifyRequestTypeId =>_lookupRequestTypeById
I found need to have _verifyRequestTypeId() actually return the
request_type in a reimplementation of getRequest() that I'm working on,
so I've made this change.  Some tests are failing because of the use of
_verifyRequestTypeId().  Next commit will address that.
2015-12-30 03:55:28 -08:00
Bradley M. Kuhn
b03a469338 Simplify code: use helper function that does same
This code was roughly duplicate of what _verifyRequestTypeId() was
already doing.
2015-12-30 03:33:36 -08:00
Bradley M. Kuhn
453caf26bf exit on wrong number of args. 2015-12-30 03:17:33 -08:00
Bradley M. Kuhn
f17527a23e Conversion script should also use donorId. 2015-12-30 03:15:42 -08:00
Bradley M. Kuhn
9de60c3c5e Use donorId rather than supporterId as main handle
Since we converted to making this a more general donor database, change
the handle used for an individual in the database from supporterId to
donorId.

Note that I left addSupporter() method name untouched because it does
automatically assume you mean a supporter, not a mere donor.  Later, an
addDonor() method should likely be added.
2015-12-30 03:13:41 -08:00
Bradley M. Kuhn
95ef1fce28 Change table to donor; add is_supporter field.
Up until now, this software has been focused on just Supporters, but
really there is no reason this should not be a general donor database.
Therefore, don't use the name supporter in the database, and add a
field.

public_ack is now allowed to be NULL, because the idea being we don't
have an answer from all who donate whether or not they want public
acknowledgment.

the is_supporter boolean is added to record whether or not they came
through the supporter program.
2015-12-30 03:10:07 -08:00
Bradley M. Kuhn
f74c5d1854 DESTROY: detect _beginWork/_commit mismatches.
The best place to detect these mismatches is in DESTROY.  An error
should be given when they are mismatched and we DESTROY the object.
That's now done.
2015-12-20 18:52:08 -08:00
Bradley M. Kuhn
096561a5c4 _rollback() work if failure occurs in these calls.
This is the location where there was unbalanced _beginWork()/_commit()
calls.  In future, when writing tests, it's probably good to check this
often in the tests.
2015-12-20 18:51:53 -08:00
Bradley M. Kuhn
794d34a79f Test begin work/commit nesting in a few places.
I discovered a bug where _beginWork() and _commit() calls were not
properly matched.  These tests are added to find them.
2015-12-20 18:51:46 -08:00
Bradley M. Kuhn
5a37adc626 getPreferredEmailAddress: initial implementation. 2015-12-20 18:22:15 -08:00
Bradley M. Kuhn
2e39065c3e setPreferredEmailAddress: initial implementation
These tests now pass:

ok 106 - setPreferredEmailAddress: dies for undefined id
ok 107 - setPreferredEmailAddress: dies for non-numeric id
ok 108 - setPreferredEmailAddress: email address undefined fails
ok 109 - setPreferredEmailAddress: email address with extra @ fails to add.
ok 112 - setPreferredEmailAddress: email address not found in database does not die....
ok 113 - setPreferredEmailAddress: ....but returns undef
ok 116 - setPreferredEmailAddress: setting preferred email address succeeds....
ok 117 - setPreferredEmailAddress: ... and returns correct email_address_id on success
2015-12-20 18:10:56 -08:00
Bradley M. Kuhn
69a5ffdbf6 get/setPreferredEmailAddress: initial tests. 2015-12-20 17:57:30 -08:00
Bradley M. Kuhn
7e82e94b55 Can't enforce one preferred email with UNIQUE key
The problem is that the supporter can have multiple non-preferred email
addresses.

I'd have to investigate if there's a way to make a UNIQUE key on a value
set to a specific value.
2015-12-20 17:49:09 -08:00
Bradley M. Kuhn
9474dacd6c addRequest() and fulfillRequest() in db conversion
The db conversion script can now use these two methods.
2015-12-20 17:34:18 -08:00
Bradley M. Kuhn
f1b8406e61 Add missing =back in documentation. 2015-12-20 17:11:01 -08:00
Bradley M. Kuhn
2dafc3c544 Correct test; it used incorrect variable 2015-12-20 17:10:18 -08:00
Bradley M. Kuhn
cb1ce38650 fulfillRequest: test had incorrect return value.
fulfillRequest() returns the id, not a hash of values.
2015-12-20 17:07:44 -08:00
Bradley M. Kuhn
3ff735584c This test did not belong here.
I believe this was due to a bad cut-and-paste in a previous commit.
2015-12-20 17:05:20 -08:00
Bradley M. Kuhn
f29a243db3 Extract $requestId from getRequest() return.
of course, getRequest() returns  a hash so we must properly extract the
value we want.

This fix causes this test to now pass:

ok 73 - fulfillRequest: databse entry from successful return is correct
2015-12-20 17:02:44 -08:00
Bradley M. Kuhn
6307cfdd26 Fix typos in the test message descriptions. 2015-12-20 16:59:29 -08:00
Bradley M. Kuhn
ef7a4ecc49 Add blank line. 2015-12-20 16:58:42 -08:00
Bradley M. Kuhn
3b3ee21288 Fix typos in SQL and return value.
This causes the basic add test to finally pass:

ok 70 - fulfillRequest: succeeds for existing request
2015-12-20 16:58:13 -08:00
Bradley M. Kuhn
a1f00e68a0 confess() rather than die() here.
We  really want to know the context of what happened when it dies here.
2015-12-20 16:55:15 -08:00
Bradley M. Kuhn
6de0eb64a2 Remove uncontrolled debugging statements.
Yes, I should add a debug mode.  But I'm not going to.
2015-12-20 16:43:16 -08:00
Bradley M. Kuhn
89149fe043 getRequest: Initial implementation.
This implementation of getRequest passes all the current tests, except
for those relate to fulfillment.
2015-12-20 16:40:27 -08:00
Bradley M. Kuhn
4f42fe50d2 Test have today in UTC
It seems that date('now'), at least in sqlite, is in UTC.  So, we want
the tests to match that.

There are still timing bugs possible here, but with this change, they
should only occur if you run the test right at 23:58 or 23:59 UTC. :)
2015-12-20 16:39:00 -08:00
Bradley M. Kuhn
c8bbcc05e4 Parameter here is "notes", not "note" 2015-12-20 15:15:39 -08:00
Bradley M. Kuhn
da396611fc Correct description string of this test. 2015-12-20 15:13:42 -08:00
Bradley M. Kuhn
e0f7e66bba getReqeust: don't use paramater has setup.
We don't really need lookup based on requestTypeId for this anyway, so
this method really only needs two arguments (perhaps a third optional
argument to be added later).
2015-12-20 14:22:46 -08:00
Bradley M. Kuhn
b62283dc74 Each supporter only makes each type of request 1x. 2015-12-20 14:07:57 -08:00
Bradley M. Kuhn
ccfa057cce Fix my bad spelling: fufill -> fulfill 2015-12-20 14:01:15 -08:00
Bradley M. Kuhn
aff5e66786 fulfillRequest(): basic implementation.
First attempt at implementing fulfillRequest() method.

It seems that request_id was incorrectly missing from the fulfillment
table.
2015-12-20 13:59:50 -08:00
Bradley M. Kuhn
84f81b4dd3 fulfillRequest: Behavior for "refill" request
When a request is already fulfilled, fulfillRequest() should return the
record that was found for the previous fulfillment.
2015-12-20 13:50:06 -08:00
Bradley M. Kuhn
3afe947cdd fufillRequest: parameter checks.
Parameter check tests now pass:

ok 66 - fufillRequest: dies if supporterId not specified
ok 67 - fufillRequest: dies if supporterId not found in database
ok 68 - fufillRequest: dies if requestType not specified
ok 69 - fufillRequest: who not specified

Also added new test.
2015-12-20 13:46:45 -08:00
Bradley M. Kuhn
1d83205949 fufillRequest: more tests. 2015-12-20 13:36:56 -08:00
Bradley M. Kuhn
075d7998d8 addRequest: Two additional tests. 2015-12-20 13:30:33 -08:00
Bradley M. Kuhn
cb01c1a14c addRequest: initial implementation
addRequest-specific unit tests now all pass:

ok 55 - addRequest: dies if supporterId not specified.
ok 56 - addRequest: dies if requestTypeId / requestType not specified.
ok 57 - addRequest: dies if supporterId invalid.
ok 58 - addRequest: dies if requestTypeId invalid.
ok 59 - addRequest: succeeds with a requestType but no configuration parameter.
ok 60 - addRequest: id returned on successful addRequest() is a number
ok 61 - addRequest: underlying call to addRequestType works properly, per getRequestType
ok 62 - addRequest: succeeds with a requestType and requestConfiguration and a note.
ok 63 - addRequest: succeeds with a requestTypeId and requestConfigurationId with no a note.
2015-12-20 12:46:07 -08:00
Bradley M. Kuhn
d654622ebe We've already done one ResetDB above.
So make sure we're reseting the right DB
2015-12-20 12:45:43 -08:00
Bradley M. Kuhn
49273ecbde Be sure DESTROY is called, etc. 2015-12-20 12:45:36 -08:00
Bradley M. Kuhn
17c0f38639 Correct test: wrong comparison.
It was comparing a request_id to a request_type_id.  That is herein corected.
2015-12-20 12:45:15 -08:00
Bradley M. Kuhn
847858bbf0 transaction counter is per instance.
The older transaction counter was for the whole class, which was
problematic if you had more than one supporter database open at a time,
or were otherwise using different supporter databases.

I'm not completely sure this fix is fully functional, because perhaps we
should be carrying this counter along with the DBH (i.e., what if two
Supporter instances are created with the same dbh).

I suppose we could fix this problem by changing the new() interface to
require the instance itself be in control of the dbh.
2015-12-20 12:21:38 -08:00
Bradley M. Kuhn
5cc564202e Remove debugging print in tests. 2015-12-20 12:11:42 -08:00
Bradley M. Kuhn
4ca89cfad4 _getOrCreateRequestConfiguration: Fix various bugs
There was some parameter confusion (using ids instead of the actual
types/descriptions) on some of the public facing methods.

Also, lookup of existing ids was buggy; just use public facing methods.
2015-12-20 12:10:27 -08:00
Bradley M. Kuhn
5e03ffd74d _getOrCreateRequestConfiguration:Refine unit tests
The unit tests had some bugs, which are herein fixed.
2015-12-20 12:09:52 -08:00
Bradley M. Kuhn
92d36a4039 _getOrCreateRequestConfiguration: Implement.
Implementation of this method.
2015-12-20 11:20:16 -08:00
Bradley M. Kuhn
3203a62d5b More descriptive variable name. 2015-12-20 11:14:13 -08:00
Bradley M. Kuhn
b065293ce7 Correct hash lookup typo. 2015-12-20 11:13:18 -08:00
Bradley M. Kuhn
4ef9b9634a Improve test string here. 2015-12-20 11:12:46 -08:00
Bradley M. Kuhn
fc2250203d _getOrCreateRequestConfiguration: Additional test.
This additional test makes sure that it still fails a previous condition
when the requestTypeId is correct.
2015-12-20 11:12:12 -08:00
Bradley M. Kuhn
8f22a89a47 _getOrCreateRequestConfiguration: error conditions
These tests now pass:

ok 110 - _getOrCreateRequestConfiguration: dies on empty hash
ok 111 - _getOrCreateRequestConfiguration: dies for string requestConfigurationId
ok 112 - _getOrCreateRequestConfiguration: dies for non-existant requestConfigurationId
ok 113 - _getOrCreateRequestConfiguration: dies for string request id
ok 114 - _getOrCreateRequestConfiguration: dies for non-existant requestTypeId
2015-12-20 11:11:42 -08:00