Skip to content
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.

Sign up for GitHub

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

Possible solution to non-existent column issue #7

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Possible solution to non-existent column issue #7

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8db84cb
Possible solution for non-existent column issue
Ingvord Jun 8, 2024
6124977
Prettify
Ingvord Jun 8, 2024
570fd20
Prettify
Ingvord Jun 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 29 additions & 5 deletions ...b/src/main/java/ispyb/server/biosaxs/services/core/experiment/Experiment3ServiceBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,35 @@ private String getQueryByScope(ExperimentScope scope){

@Override
public Experiment3VO findByMeasurementId(int measurementId){
String ejbQLQuery = getQueryByScope(ExperimentScope.MEDIUM)
+ " WHERE specimens.measurementId = :measurementId";
TypedQuery<Experiment3VO> query = entityManager.createQuery(ejbQLQuery, Experiment3VO.class)
.setParameter("measurementId", measurementId);
return query.getSingleResult();
// String ejbQLQuery = getQueryByScope(ExperimentScope.MEDIUM)
// + " WHERE specimens.measurementId = :measurementId";

String sqlQLQuery =
"""
SELECT DISTINCT
experiment.experimentId,
specimen.specimenId, specimen.bufferId, specimen.code, specimen.comments, specimen.concentration, specimen.experimentId, specimen.safetyLevelId, specimen.stockSolutionId, specimen.volume,
macromolecule.macromoleculeId, macromolecule.acronym, macromolecule.comments, macromolecule.contactsDescriptionFilePath, macromolecule.creationDate, macromolecule.electronDensity, macromolecule.extintionCoefficient, macromolecule.molecularMass, macromolecule.name, macromolecule.proposalId, macromolecule.refractiveIndex, macromolecule.safetyLevelId, macromolecule.sequence, macromolecule.solventViscosity, macromolecule.symmetry,
samplePlatePosition.samplePlatePositionId, samplePlatePosition.columnNumber, samplePlatePosition.rowNumber, samplePlatePosition.samplePlateId, samplePlatePosition.volume,
measurement.specimenId, measurement.code, measurement.comments, measurement.exposureTemperature, measurement.extraFlowTime, measurement.flow, measurement.imageDirectory, measurement.measurementId, measurement.pathToH5, measurement.priorityLevelId, measurement.transmission, measurement.viscosity, measurement.volumeToLoad, measurement.waitTime,
run.runId, run.beamCenterX, run.beamCenterY, run.creationDate, run.energy, run.exposureTemperature, run.normalization, run.pixelSizeX, run.pixelSizeY, run.radiationAbsolute, run.radiationRelative, run.spectrophotometer, run.storageTemperature, run.timeEnd, run.timePerFrame, run.timeStart, run.transmission
FROM
Experiment experiment
LEFT JOIN Specimen specimen ON experiment.experimentId = specimen.experimentId
LEFT JOIN Macromolecule macromolecule ON specimen.macromoleculeId = macromolecule.macromoleculeId
LEFT JOIN SamplePlatePosition samplePlatePosition ON specimen.samplePlatePositionId = samplePlatePosition.samplePlatePositionId
LEFT JOIN Measurement measurement ON specimen.specimenId = measurement.specimenId
LEFT JOIN Run run ON measurement.runId = run.runId
WHERE
measurement.measurementId = ?1
ORDER BY
experiment.experimentId ASC, specimen.specimenId ASC
""";

return (Experiment3VO) entityManager.createNativeQuery(sqlQLQuery, Experiment3VO.class)
// .setParameter("measurementId", measurementId);
.setParameter(1, measurementId)
.getSingleResult();
}


Expand Down