alembic/versions/4df932caa9a9_add_needinfo_request.py
20	When upgrading, needinfo won't be set to true and we lose information whether particular bug has needinfo. Do we want to do "update bug set needinfo to true where needinfo_requestee is not empty" in the migration script? Or are we ok with the current state?

mkrizek added a task: T373: blockerbugs sync fails when a bug with empty 'needinfo' is part of sync set.Nov 10 2014, 11:37 AM

Functionality looks good to me. Per discussion on IRC, the migration has been tested with postgres

alembic/versions/4df932caa9a9_add_needinfo_request.py
20	I think it depends on how much work that'd be. If it's quick, that'd be a nice-to-have but I don't think it'd be required. We'd be talking about only a few active bugs with needinfo set, so it wouldn't be horrible if we ended up needing to alter a few db records to make sure that the upgrade went smoothly and I'm not aware of any other folks using blockerbugs

This revision is now accepted and ready to land.Nov 10 2014, 8:06 PM

Do not lose information about needinfo in data migration

Bah, I didn't notice the change - phab still shows me as approved.

But, as long as this has been tested with postgres, looks good to me and no change on approved

Closed by commit rBLKR19d3198dcedc (authored by @mkrizek).

Revision Contents

		Path
A	M	alembic/versions/4df932caa9a9_add_needinfo_request.py (38 lines)
M		blockerbugs/models/bug.py (10 lines)
M		blockerbugs/templates/blocker_list.html (2 lines)
M		blockerbugs/util/bug_sync.py (11 lines)
M		testing/test_bugsync_extract_information.py (27 lines)
M		testing/test_controllers.py (2 lines)
M		testing/testfunc_bugmodel.py (2 lines)
M		testing/testfunc_bugsync.py (3 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	733	832d498		Nov 7 2014, 5:14 PM	★	★
Diff 2	734	832d498	- Do not lose information about needinfo in data migration	Nov 11 2014, 12:56 PM	★	★
Diff 3	737	832d498	Commit rBLKR19d3198dcedc546619133567259f1e9382bc8296	Nov 14 2014, 12:19 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
5f4f459816f7	9bd5b8e7e7ff	3c2380949e78	Martin Krizek	Do not lose information about needinfo in data migration	Nov 11 2014, 12:54 PM
3c2380949e78	da19e7d56881	832d49871ddf	Martin Krizek	Fix syncing when needinfo has no requestee (Show More…)	Nov 7 2014, 5:13 PM

Diff 737

View Options

alembic/versions/4df932caa9a9_add_needinfo_request.py

This file was added.

1		"""add needinfo_requestee field to the bug table
2
3		Revision ID: 4df932caa9a9
4		Revises: 1dfd879c7637
5		Create Date: 2014-11-07 09:27:48.882949
6
7		"""
8
9		# revision identifiers, used by Alembic.
10		revision = '4df932caa9a9'
11		down_revision = '1dfd879c7637'
12
13		from alembic import op
14		import sqlalchemy as sa
15
16		from sqlalchemy.sql import table, column
17		from sqlalchemy import String, Boolean
18
19		def upgrade():
20		op.alter_column(u'bug', u'needinfo', new_column_name=u'needinfo_requestee')
	mkrizekAuthorUnsubmitted Not Done When upgrading, needinfo won't be set to true and we lose information whether particular bug has needinfo. Do we want to do "update bug set needinfo to true where needinfo_requestee is not empty" in the migration script? Or are we ok with the current state?
	tflinkUnsubmitted Not Done I think it depends on how much work that'd be. If it's quick, that'd be a nice-to-have but I don't think it'd be required. We'd be talking about only a few active bugs with needinfo set, so it wouldn't be horrible if we ended up needing to alter a few db records to make sure that the upgrade went smoothly and I'm not aware of any other folks using blockerbugs
21		op.add_column(u'bug', sa.Column(u'needinfo', sa.Boolean))
22
23		bug = table('bug',
24		column('needinfo', Boolean),
25		column('needinfo_requestee', String)
26		)
27
28		op.execute(
29		bug.update().\
30		where(bug.c.needinfo_requestee!=op.inline_literal('')).\
31		values({'needinfo':op.inline_literal(True)})
32		)
33
34
35
36		def downgrade():
37		op.drop_column(u'bug', u'needinfo')
38		op.alter_column(u'bug', u'needinfo_requestee', new_column_name=u'needinfo')

View Options

blockerbugs/models/bug.py

Show All 28 Lines		28	class Bug(db.Model):
29	id = db.Column(db.Integer, primary_key=True)	29		id = db.Column(db.Integer, primary_key=True)
30	bugid = db.Column(db.Integer, unique=False)	30		bugid = db.Column(db.Integer, unique=False)
31	url = db.Column(db.String(1024), unique=False)	31		url = db.Column(db.String(1024), unique=False)
32	summary = db.Column(db.String(2048), unique=False)	32		summary = db.Column(db.String(2048), unique=False)
33	status = db.Column(db.String(80), unique=False)	33		status = db.Column(db.String(80), unique=False)
34	component = db.Column(db.String(80), unique=False)	34		component = db.Column(db.String(80), unique=False)
35	active = db.Column(db.Boolean)	35		active = db.Column(db.Boolean)
36	last_bug_sync = db.Column(db.DateTime)	36		last_bug_sync = db.Column(db.DateTime)
37	needinfo = db.Column(db.String(1024), unique=False)	37		needinfo = db.Column(db.Boolean)
		38		needinfo_requestee = db.Column(db.String(1024), unique=False)
38	proposed_blocker = db.Column(db.Boolean)	39		proposed_blocker = db.Column(db.Boolean)
39	proposed_fe = db.Column(db.Boolean)	40		proposed_fe = db.Column(db.Boolean)
40	rejected_blocker = db.Column(db.Boolean)	41		rejected_blocker = db.Column(db.Boolean)
41	rejected_fe = db.Column(db.Boolean)	42		rejected_fe = db.Column(db.Boolean)
42	accepted_blocker = db.Column(db.Boolean)	43		accepted_blocker = db.Column(db.Boolean)
43	accepted_fe = db.Column(db.Boolean)	44		accepted_fe = db.Column(db.Boolean)
44	milestone_id = db.Column(db.Integer, db.ForeignKey('milestone.id'))	45		milestone_id = db.Column(db.Integer, db.ForeignKey('milestone.id'))
45	milestone = db.relationship('Milestone',	46		milestone = db.relationship('Milestone',
46	backref=db.backref('bugs', lazy='dynamic'))	47		backref=db.backref('bugs', lazy='dynamic'))
47	#backref='bugs')	48		#backref='bugs')
48		49
49	def __init__(self, bugid, url, summary, status, component, milestone,	50		def __init__(self, bugid, url, summary, status, component, milestone,
50	active, needinfo, last_bug_sync=datetime.datetime.now()):	51		active, needinfo, needinfo_requestee,
		52		last_bug_sync=datetime.datetime.now()):
51	self.bugid = bugid	53		self.bugid = bugid
52	self.url = url	54		self.url = url
53	self.summary = summary	55		self.summary = summary
54	self.status = status	56		self.status = status
55	self.component = component	57		self.component = component
56	self.active = active	58		self.active = active
57	self.needinfo = needinfo	59		self.needinfo = needinfo
		60		self.needinfo_requestee = needinfo_requestee
58	self.milestone = milestone	61		self.milestone = milestone
59	self.proposed_blocker = False	62		self.proposed_blocker = False
60	self.accepted_blocker = False	63		self.accepted_blocker = False
61	self.rejected_blocker = False	64		self.rejected_blocker = False
62	self.proposed_fe = False	65		self.proposed_fe = False
63	self.accepted_fe = False	66		self.accepted_fe = False
64	self.rejected_fe = False	67		self.rejected_fe = False
65	self.last_bug_sync = last_bug_sync	68		self.last_bug_sync = last_bug_sync
66		69
67	def __repr__(self):	70		def __repr__(self):
68	return '<bug %d: %s>' % (self.bugid, self.summary)	71		return '<bug %d: %s>' % (self.bugid, self.summary)
69		72
70	def update(self, buginfo, tracker_type, release):	73		def update(self, buginfo, tracker_type, release):
71	self.url = buginfo['url']	74		self.url = buginfo['url']
72	self.summary = buginfo['summary']	75		self.summary = buginfo['summary']
73	self.status = buginfo['status']	76		self.status = buginfo['status']
74	self.component = buginfo['component']	77		self.component = buginfo['component']
75	self.last_bug_sync = buginfo['last_change_time']	78		self.last_bug_sync = buginfo['last_change_time']
76	self.active = buginfo['active']	79		self.active = buginfo['active']
77	self.needinfo = buginfo['needinfo']	80		self.needinfo = buginfo['needinfo']
		81		self.needinfo_requestee = buginfo['needinfo_requestee']
78	if tracker_type == 'Blocker':	82		if tracker_type == 'Blocker':
79	self.proposed_blocker = buginfo['proposed']	83		self.proposed_blocker = buginfo['proposed']
80	self.accepted_blocker = buginfo['accepted']	84		self.accepted_blocker = buginfo['accepted']
81	self.rejected_blocker = buginfo['rejected']	85		self.rejected_blocker = buginfo['rejected']
82	elif tracker_type == 'FreezeException':	86		elif tracker_type == 'FreezeException':
83	self.proposed_fe = buginfo['proposed']	87		self.proposed_fe = buginfo['proposed']
84	self.accepted_fe = buginfo['accepted']	88		self.accepted_fe = buginfo['accepted']
85	self.rejected_fe = buginfo['rejected']	89		self.rejected_fe = buginfo['rejected']
86	if release.id != self.milestone.id:	90		if release.id != self.milestone.id:
87	raise ValueError('Bugs with the same id and different releases should be different rows!')	91		raise ValueError('Bugs with the same id and different releases should be different rows!')
88		92
89	@classmethod	93		@classmethod
90	def from_data(cls, buginfo, release, tracker_type):	94		def from_data(cls, buginfo, release, tracker_type):
91	newbug = Bug(buginfo['bug_id'], '', '', '','', release, buginfo['active'], '')	95		newbug = Bug(buginfo['bug_id'], '', '', '','', release, buginfo['active'], False, '')
92	newbug.update(buginfo, tracker_type, release)	96		newbug.update(buginfo, tracker_type, release)
93	return newbug	97		return newbug
94		98

View Options

blockerbugs/templates/blocker_list.html

Show First 20 Lines • Show All 65 Lines • ▼ Show 20 Line(s)		62	<tr>
66	<th>Status</th>	66		<th>Status</th>
67	<th>Title</th>	67		<th>Title</th>
68	<th>Updates</th>	68		<th>Updates</th>
69	</tr>	69		</tr>
70	</thead>	70		</thead>
71	<tbody>	71		<tbody>
72	{% for bug in buglists[buglist] %}	72		{% for bug in buglists[buglist] %}
73	<tr>	73		<tr>
74	<td>{% if bug.bugid in recent %}<span class="foundicon-idea yellow" title="modified recently"></span>{% endif %} {% if bug.needinfo %}<span class="needinfo" title="NEEDINFO from {{ bug.needinfo }}">?</span>{% endif %}</td>	74		<td>{% if bug.bugid in recent %}<span class="foundicon-idea yellow" title="modified recently"></span>{% endif %} {% if bug.needinfo %}<span class="needinfo" title="NEEDINFO{% if bug.needinfo_requestee %} from {{ bug.needinfo_requestee }}{% else %}{% endif %}">?</span>{% endif %}</td>
75	<td class='bugid'><a href='{{ bug.url }}'>{{ bug.bugid }}</a></td>	75		<td class='bugid'><a href='{{ bug.url }}'>{{ bug.bugid }}</a></td>
76	<td>{{ bug.component }}</td>	76		<td>{{ bug.component }}</td>
77	<td>{{ bug.status }}</td>	77		<td>{{ bug.status }}</td>
78	<td>{{ bug.summary }}</td>	78		<td>{{ bug.summary }}</td>
79	<td class="popupification">	79		<td class="popupification">
80	<a href="{{ url_for('main.display_bug_updates', bugid=bug.bugid) }}"	80		<a href="{{ url_for('main.display_bug_updates', bugid=bug.bugid) }}"
81	rel="{{ url_for('main.display_bug_updates', bugid=bug.bugid) }}"	81		rel="{{ url_for('main.display_bug_updates', bugid=bug.bugid) }}"
82	title='{{ bug.bugid }}'>	82		title='{{ bug.bugid }}'>
Show All 19 Lines

View Options

blockerbugs/util/bug_sync.py

Show First 20 Lines • Show All 51 Lines • ▼ Show 20 Line(s)		42	def extract_information(self, bug, tracker_type):
52	buginfo['active'] = not self.closedre.match(bug.status)	52		buginfo['active'] = not self.closedre.match(bug.status)
53		53
54	# basic info	54		# basic info
55	buginfo['bug_id'] = bug.bug_id	55		buginfo['bug_id'] = bug.bug_id
56	buginfo['component'] = bug.component	56		buginfo['component'] = bug.component
57	buginfo['summary'] = bug.summary	57		buginfo['summary'] = bug.summary
58	buginfo['status'] = bug.status	58		buginfo['status'] = bug.status
59	buginfo['url'] = bug.weburl	59		buginfo['url'] = bug.weburl
60	buginfo['needinfo'] = ''	60		buginfo['needinfo'] = False
		61		buginfo['needinfo_requestee'] = ''
61		62
62	# needinfo flag	63		# needinfo flag
63	if hasattr(bug, 'flags'):	64		if hasattr(bug, 'flags'):
64	needinfos = []	65		needinfos = []
65	for flag in bug.flags:	66		for flag in bug.flags:
66	if flag['name'] == 'needinfo' and flag['status'] == '?' and flag['is_active']:	67		if flag['name'] == 'needinfo' and flag['status'] == '?' and flag['is_active']:
67	needinfos.append(flag['requestee'])	68		buginfo['needinfo'] = True
68	buginfo['needinfo'] = ', '.join(needinfos)	69		try:
		70		needinfos.append(flag['requestee'])
		71		except KeyError, e:
		72		pass
		73		buginfo['needinfo_requestee'] = ', '.join(needinfos)
69		74
70	# according to bugzilla's docs, this is always in UTC	75		# according to bugzilla's docs, this is always in UTC
71	last_change_time = bug.last_change_time.timetuple()	76		last_change_time = bug.last_change_time.timetuple()
72	buginfo['last_change_time'] = datetime(last_change_time.tm_year,	77		buginfo['last_change_time'] = datetime(last_change_time.tm_year,
73	last_change_time.tm_mon,	78		last_change_time.tm_mon,
74	last_change_time.tm_mday,	79		last_change_time.tm_mday,
75	last_change_time.tm_hour,	80		last_change_time.tm_hour,
76	last_change_time.tm_min,	81		last_change_time.tm_min,
▲ Show 20 Lines • Show All 91 Lines • Show Last 20 Lines

View Options

testing/test_bugsync_extract_information.py

Show First 20 Lines • Show All 113 Lines • ▼ Show 20 Line(s)		18	class TestSyncExtractInformation(object):
114	def test_notclosed_active(self):	114		def test_notclosed_active(self):
115	buginfo = self.testsync.extract_information(self.testbug, 'Blocker')	115		buginfo = self.testsync.extract_information(self.testbug, 'Blocker')
116		116
117	assert buginfo['active'] == True	117		assert buginfo['active'] == True
118		118
119	def test_needinfo(self):	119		def test_needinfo(self):
120	buginfo = self.testsync.extract_information(self.testbug, 'Blocker')	120		buginfo = self.testsync.extract_information(self.testbug, 'Blocker')
121		121
122	assert buginfo['needinfo'] == 'John Doe'	122		assert buginfo['needinfo']
		123		assert buginfo['needinfo_requestee'] == 'John Doe'
123		124
124	def test_multiple_needinfo(self):	125		def test_multiple_needinfo(self):
125	self.testbug.flags.append({'name': 'needinfo', 'status': '?', 'is_active': True, 'requestee': 'Jane Doe'})	126		self.testbug.flags.append({'name': 'needinfo', 'status': '?', 'is_active': True, 'requestee': 'Jane Doe'})
126	buginfo = self.testsync.extract_information(self.testbug, 'Blocker')	127		buginfo = self.testsync.extract_information(self.testbug, 'Blocker')
127		128
128	assert buginfo['needinfo'] == 'John Doe, Jane Doe'	129		assert buginfo['needinfo']
		130		assert buginfo['needinfo_requestee'] == 'John Doe, Jane Doe'
		131
		132		def test_needinfo_no_requestee(self):
		133		self.testbug.flags[0].pop('requestee')
		134		buginfo = self.testsync.extract_information(self.testbug, 'Blocker')
		135
		136		assert buginfo['needinfo']
		137		assert buginfo['needinfo_requestee'] == ''
		138
		139		def test_multiple_needinfo_no_requestee(self):
		140		self.testbug.flags.append({'name': 'needinfo', 'status': '?', 'is_active': True})
		141		buginfo = self.testsync.extract_information(self.testbug, 'Blocker')
		142
		143		assert buginfo['needinfo']
		144		assert buginfo['needinfo_requestee'] == 'John Doe'
		145
		146		def test_needinfo_empty(self):
		147		self.testbug.flags = []
		148		buginfo = self.testsync.extract_information(self.testbug, 'Blocker')
		149
		150		assert buginfo['needinfo'] == False
		151		assert buginfo['needinfo_requestee'] == ''

View Options

testing/test_controllers.py

Show All 36 Lines		30	def add_spin(name, spin_type, updates, milestone, state=SpinState.built):
37	db.session.add(test_spin)	37		db.session.add(test_spin)
38	db.session.commit()	38		db.session.commit()
39	return test_spin	39		return test_spin
40		40
41		41
42	def add_bug(bugid, summary, milestone):	42		def add_bug(bugid, summary, milestone):
43	test_bug = Bug(bugid,	43		test_bug = Bug(bugid,
44	'https://bugzilla.redhat.com/show_bug.cgi?id=%d' % bugid,	44		'https://bugzilla.redhat.com/show_bug.cgi?id=%d' % bugid,
45	summary, 'NEW', 'testcomponent', milestone, True, 'John Doe')	45		summary, 'NEW', 'testcomponent', milestone, True, True, 'John Doe')
46	test_bug.accepted_blocker = True	46		test_bug.accepted_blocker = True
47	db.session.add(test_bug)	47		db.session.add(test_bug)
48	db.session.commit()	48		db.session.commit()
49	return test_bug	49		return test_bug
50		50
51		51
52	def add_update(title, status, bugs, release, milestones,	52		def add_update(title, status, bugs, release, milestones,
53	url='http://localhost/update'):	53		url='http://localhost/update'):
▲ Show 20 Lines • Show All 191 Lines • Show Last 20 Lines

View Options

testing/testfunc_bugmodel.py

Show All 12 Lines		12	def generate_release(number=99):
13	return Release(number)	13		return Release(number)
14		14
15	def generate_milestone(version, name, release, blocker_tracker=123456, accepted_tracker=234567):	15		def generate_milestone(version, name, release, blocker_tracker=123456, accepted_tracker=234567):
16	return Milestone(release, version, blocker_tracker, accepted_tracker, name)	16		return Milestone(release, version, blocker_tracker, accepted_tracker, name)
17		17
18		18
19	def generate_bug(bugid, summary, milestone):	19		def generate_bug(bugid, summary, milestone):
20	return Bug(bugid, 'https://bugzilla.redhat.com/show_bug.cgi?id=%d' % bugid,	20		return Bug(bugid, 'https://bugzilla.redhat.com/show_bug.cgi?id=%d' % bugid,
21	summary, 'NEW', 'testcomponent', milestone, True, 'John Doe')	21		summary, 'NEW', 'testcomponent', milestone, True, True, 'John Doe')
22		22
23	def generate_update(title, status, bugs, release, milestones, url='http://localhost/update'):	23		def generate_update(title, status, bugs, release, milestones, url='http://localhost/update'):
24	return Update(title, url, 1, status, bugs,	24		return Update(title, url, 1, status, bugs,
25	release, milestones, date_submitted=datetime.datetime.utcnow() )	25		release, milestones, date_submitted=datetime.datetime.utcnow() )
26		26
27		27
28	class TestfuncBugModel(object):	28		class TestfuncBugModel(object):
29	def setup_method(self, method):	29		def setup_method(self, method):
▲ Show 20 Lines • Show All 183 Lines • Show Last 20 Lines

View Options

testing/testfunc_bugsync.py

Show All 26 Lines		23	templatebuginfo = {
27	'status': 'NEW',	27		'status': 'NEW',
28	'summary': 'this is a test bug',	28		'summary': 'this is a test bug',
29	'whiteboard': '',	29		'whiteboard': '',
30	'accepted': False,	30		'accepted': False,
31	'rejected': False,	31		'rejected': False,
32	'proposed': False,	32		'proposed': False,
33	'last_change_time': datetime.datetime.utcnow(),	33		'last_change_time': datetime.datetime.utcnow(),
34	'active': True,	34		'active': True,
35	'needinfo': 'John Doe'	35		'needinfo': True,
		36		'needinfo_requestee': 'John Doe'
36	}	37		}
37		38
38		39
39	class StubBzInterface(object):	40		class StubBzInterface(object):
40	def __init__(self, deps=[], bugs=[]):	41		def __init__(self, deps=[], bugs=[]):
41	self.deps = deps	42		self.deps = deps
42	self.bugs = bugs	43		self.bugs = bugs
43		44
▲ Show 20 Lines • Show All 246 Lines • Show Last 20 Lines

Fix syncing when needinfo has no requesteeClosedPublicActions

Details

Diff Detail

Revision Contents

Diff 737

alembic/versions/4df932caa9a9_add_needinfo_request.py

blockerbugs/models/bug.py

blockerbugs/templates/blocker_list.html

blockerbugs/util/bug_sync.py

testing/test_bugsync_extract_information.py

testing/test_controllers.py

testing/testfunc_bugmodel.py

testing/testfunc_bugsync.py

Fix syncing when needinfo has no requestee
ClosedPublic
Actions