-
-
Notifications
You must be signed in to change notification settings - Fork 152
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Backported #1616: Fix writing methods on read when reindexing services #1617
Merged
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
# -*- coding: utf-8 -*- | ||
# | ||
# This file is part of SENAITE.CORE. | ||
# | ||
# SENAITE.CORE is free software: you can redistribute it and/or modify it under | ||
# the terms of the GNU General Public License as published by the Free Software | ||
# Foundation, version 2. | ||
# | ||
# This program is distributed in the hope that it will be useful, but WITHOUT | ||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | ||
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more | ||
# details. | ||
# | ||
# You should have received a copy of the GNU General Public License along with | ||
# this program; if not, write to the Free Software Foundation, Inc., 51 | ||
# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
# | ||
# Copyright 2018-2020 by it's authors. | ||
# Some rights reserved, see README and LICENSE. | ||
|
||
from bika.lims import api | ||
from bika.lims import logger | ||
from bika.lims.catalog import CATALOG_ANALYSIS_REQUEST_LISTING | ||
from bika.lims.catalog import SETUP_CATALOG | ||
from bika.lims.config import PROJECTNAME as product | ||
from bika.lims.upgrade import upgradestep | ||
from bika.lims.upgrade.utils import UpgradeUtils | ||
|
||
version = "1.3.5" # Remember version number in metadata.xml and setup.py | ||
profile = "profile-{0}:default".format(product) | ||
|
||
INDEXES_TO_ADD = [ | ||
# List of tuples (catalog_name, index_name, index meta type) | ||
(CATALOG_ANALYSIS_REQUEST_LISTING, "modified", "DateIndex"), | ||
] | ||
|
||
|
||
@upgradestep(product, version) | ||
def upgrade(tool): | ||
portal = tool.aq_inner.aq_parent | ||
setup = portal.portal_setup | ||
ut = UpgradeUtils(portal) | ||
ver_from = ut.getInstalledVersion(product) | ||
|
||
if ut.isOlderVersion(product, version): | ||
logger.info("Skipping upgrade of {0}: {1} > {2}".format( | ||
product, ver_from, version)) | ||
return True | ||
|
||
logger.info("Upgrading {0}: {1} -> {2}".format(product, ver_from, version)) | ||
|
||
# -------- ADD YOUR STUFF BELOW -------- | ||
|
||
# Fix writing methods on read when reindexing services | ||
# https://github.com/senaite/senaite.core/pull/1617 | ||
remove_duplicate_methods_in_services(portal) | ||
|
||
logger.info("{0} upgraded to version {1}".format(product, version)) | ||
return True | ||
|
||
|
||
def remove_duplicate_methods_in_services(portal): | ||
"""A bug caused duplicate methods stored in services which need to be fixed | ||
""" | ||
logger.info("Remove duplicate methods from services...") | ||
|
||
cat = api.get_tool(SETUP_CATALOG) | ||
services = cat({"portal_type": "AnalysisService"}) | ||
total = len(services) | ||
|
||
for num, service in enumerate(services): | ||
if num and num % 10 == 0: | ||
logger.info("Processed {}/{} Services".format(num, total)) | ||
obj = api.get_object(service) | ||
methods = list(set(obj.getRawMethods())) | ||
if not methods: | ||
continue | ||
obj.setMethods(methods) | ||
obj.reindexObject() | ||
|
||
logger.info("Remove duplicate methods from services [DONE]") |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this index addition does not belong to this PR
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, just removed that code snippet 👍