PR#922: Monitor page should not show builds from PR. - copr/copr

copr / copr

#922 Monitor page should not show builds from PR.

Merged 4 years ago by praiskup. Opened 4 years ago by schlupov.

copr/ schlupov/copr edit_monitor_page into master

Monitor page should not show builds from PR.

Silvie Chlupova • 4 years ago

590caf3

frontend/coprs_frontend/alembic/schema/versions/12abab545d7a_added_index_for_main_in_copr_dir.py

file added

+22

		`@@ -0,0 +1,22 @@`
		`+ """`
		`+ Added index for main in copr_dir`
		`+`
		`+ Revision ID: 12abab545d7a`
		`+ Revises: 3cba3ffe2836`
		`+ Create Date: 2019-08-19 08:18:02.561158`
		`+ """`
		`+`
		`+ import sqlalchemy as sa`
		`+ from alembic import op`
		`+`
		`+`
		`+ revision = '12abab545d7a'`
		`+ down_revision = '3cba3ffe2836'`
		`+`
		`+`
		`+ def upgrade():`
		`+ op.create_index(op.f('ix_copr_dir_main'), 'copr_dir', ['main'], unique=False)`
		`+`
		`+`
		`+ def downgrade():`
		`+ op.drop_index(op.f('ix_copr_dir_main'), table_name='copr_dir')`

frontend/coprs_frontend/coprs/logic/builds_logic.py

file modified

		`@@ -1238,6 +1238,7 @@`
		`AND build_chroot.build_id = max_build_ids_for_a_chroot.max_build_id_for_chroot`
		`JOIN mock_chroot`
		`ON mock_chroot.id = max_build_ids_for_a_chroot.mock_chroot_id`
		`+ JOIN copr_dir ON build.copr_dir_id=copr_dir.id WHERE copr_dir.main IS TRUE`
		`ORDER BY package.name ASC, package.id ASC, mock_chroot.os_release ASC, mock_chroot.os_version ASC, mock_chroot.arch ASC`
		`""".format(copr_id=copr.id)`
		`rows = db.session.execute(query)`

frontend/coprs_frontend/coprs/models.py

file modified

+1 -1

		`@@ -561,7 +561,7 @@`
		`id = db.Column(db.Integer, primary_key=True)`

		`name = db.Column(db.Text, index=True)`
		`- main = db.Column(db.Boolean, default=False, server_default="0", nullable=False)`
		`+ main = db.Column(db.Boolean, index=True, default=False, server_default="0", nullable=False)`

		`ownername = db.Column(db.Text, index=True, nullable=False)`

schlupov commented 4 years ago

Fixes: #839

praiskup commented on line 8 of frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py 4 years ago

Wouldn't it be better to fix get_monitor_data, so only relevant builds are returned? Note that it would also fix the api call (see route "/coprs/<username>/<coprname>/monitor, but it would be probably much easier fix.

frostyx commented on line 7 of frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py 4 years ago

Keeping in mind @praiskup's comment a few lines below, this piece of code might be replaced, but just to give feedback ... It is better to avoid random numeric values in the code, so instead of 8, I would use BuildSourceEnum("scm").

1 new commit added