Property lease #83
Open
Property lease #83
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
antonkorobko
force-pushed
the
propertyLease
branch
from
a9f1490 to
9c0bc07
Compare
leits
reviewed
Apr 12, 2018
|
|
||
| class LeaseTerms(Model): | ||
|
|
||
| leaseDuration = StringType(required=True) |
There was a problem hiding this comment.
| return | ||
| if calculate_business_date(period.startDate, MINIMAL_EXPOSITION_PERIOD, data) > period.endDate: | ||
| raise ValidationError(u"tenderPeriod should be greater than 6 days") | ||
| auctionStartDate = data.get('auctionPeriod').startDate |
There was a problem hiding this comment.
data.get('auctionPeriod').startDate визначає хронограф, таких валідацій робити не можна, наступне значення може бути як і змінено, так і видалено
| auctionStartDate = data.get('auctionPeriod').startDate | ||
| delayed_auction_start_date = calculate_business_date(period.endDate, timedelta(days=4), data).replace(hour=0, minute=0, second=0, microsecond=0) | ||
| normal_auction_start_date = calculate_business_date(period.endDate, timedelta(days=1), data).replace(hour=0, minute=0, second=0, microsecond=0) | ||
| if (delayed_auction_start_date != auctionStartDate and normal_auction_start_date != auctionStartDate): |
There was a problem hiding this comment.
Допустимі рамки точно не x є N\{1,4}
|
|
||
| def validate_id(self, data, code): | ||
| if data.get('scheme') != u'CPVS': | ||
| raise ValidationError('propertyLease additionalClassifications scheme should be CPVS') |
There was a problem hiding this comment.
Це валідація не id, обмеження вибору в scheme
| id = StringType(required=True, default=u'PA01-7') | ||
|
|
||
| def validate_id(self, data, code): | ||
| if data.get('scheme') != u'CPVS': |
There was a problem hiding this comment.
Не можна обмежувати всі AdditionalClassification лише на CPVS
| @@ -94,6 +97,25 @@ def validate_id(self, data, code): | |||
| raise ValidationError(BaseType.MESSAGES['choices'].format(unicode(CPVS_CODES))) | |||
|
|
|||
|
|
|||
| class PropertyLeaseClassification(Classification): | |||
| scheme = StringType(required=True, default=u'CAV-PS') | |||
There was a problem hiding this comment.
Тут має бути оюмежено лише на CAV-PS
| """A good, service, or work to be contracted.""" | ||
| classification = ModelType(CPVCAVClassification, required=False) | ||
| propertyLeaseClassification = ModelType(PropertyLeaseClassification, required=True) | ||
| additionalClassifications = ModelType(PropertyLeaseAdditionalClassification, required=True) |
There was a problem hiding this comment.
Цей список має мати мінімальний розмір і валідацію на перший обов'язковий елемент
|
|
||
|
|
||
| class PropertyLeaseAdditionalClassification(Classification): | ||
| scheme = StringType(required=True, default=u'CPVS') |
There was a problem hiding this comment.
default значень тут не повинно бути
kukirokuk
pushed a commit
to kukirokuk/openprocurement.auctions.dgf
that referenced
this pull request
May 15, 2018
…4361_daylight_savings A547225166224361 daylight savings
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.