- Replaced ShortUrl column in DatasetStatus table with ExperimentAnnotationsId. DatasetStatus is associated with a particular copy of the data. If a new copy is made, the data status resets. Status associated with the previous copy is no longer relevant.

vagisha · vagisha · commit deb4dc1bc82d · 2025-08-29T08:08:54.000-07:00
diff --git a/panoramapublic/resources/schemas/dbscripts/postgresql/panoramapublic-25.002-25.003.sql b/panoramapublic/resources/schemas/dbscripts/postgresql/panoramapublic-25.002-25.003.sql
@@ -0,0 +1,32 @@
+-- ------------------------------------------------------------------------
+-- Replace the ShortUrl column with an ExperimentAnnotationsId column.
+-- ------------------------------------------------------------------------
+
+-- Add ExperimentAnnotationsId column as nullable first
+ALTER TABLE panoramapublic.DatasetStatus ADD COLUMN ExperimentAnnotationsId INT;
+
+-- Populate the column by matching ShortUrl values
+UPDATE panoramapublic.DatasetStatus
+SET ExperimentAnnotationsId = ea.Id
+FROM panoramapublic.ExperimentAnnotations ea
+WHERE ea.ShortUrl = panoramapublic.DatasetStatus.ShortUrl;
+
+-- Delete rows that couldn't be matched (where ExperimentAnnotationsId is still null)
+DELETE FROM panoramapublic.DatasetStatus WHERE ExperimentAnnotationsId IS NULL;
+
+-- Now make ExperimentAnnotationsId NOT NULL
+ALTER TABLE panoramapublic.DatasetStatus ALTER COLUMN ExperimentAnnotationsId SET NOT NULL;
+
+-- Add constraints and index
+ALTER TABLE panoramapublic.DatasetStatus ADD CONSTRAINT FK_DatasetStatus_ExperimentAnnotations FOREIGN KEY (ExperimentAnnotationsId) REFERENCES panoramapublic.ExperimentAnnotations(Id);
+ALTER TABLE panoramapublic.DatasetStatus ADD CONSTRAINT UQ_DatasetStatus_ExperimentAnnotations UNIQUE (ExperimentAnnotationsId);
+CREATE INDEX IX_DatasetStatus_ExperimentAnnotations ON panoramapublic.DatasetStatus(ExperimentAnnotationsId);
+
+-- Drop old constraints and index
+ALTER TABLE panoramapublic.DatasetStatus DROP CONSTRAINT FK_DatasetStatus_ShortUrl;
+ALTER TABLE panoramapublic.DatasetStatus DROP CONSTRAINT UQ_DatasetStatus_ShortUrl;
+DROP INDEX panoramapublic.IX_DatasetStatus_ShortUrl;
+
+-- Finally drop the ShortUrl column
+ALTER TABLE panoramapublic.DatasetStatus DROP COLUMN ShortUrl;
+
diff --git a/panoramapublic/resources/schemas/panoramapublic.xml b/panoramapublic/resources/schemas/panoramapublic.xml
@@ -860,13 +860,7 @@
                 <isHidden>true</isHidden>
             </column>
             <column columnName="Id"/>
-            <column columnName="ShortUrl">
-                <fk>
-                    <fkColumnName>EntityId</fkColumnName>
-                    <fkDbSchema>core</fkDbSchema>
-                    <fkTable>ShortUrl</fkTable>
-                </fk>
-            </column>
+            <column columnName="ExperimentAnnotationsId" />
             <column columnName="LastReminderDate" />
             <column columnName="ExtensionRequestedDate" />
             <column columnName="DeletionRequestedDate"/>
diff --git a/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicController.java b/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicController.java
@@ -10396,7 +10396,7 @@ public void validateCommand(ShortUrlForm shortUrlForm, Errors errors)
 
             ensureCorrectContainer(getContainer(), _exptAnnotations.getContainer(), getViewContext());
 
-            _datasetStatus = DatasetStatusManager.getForShortUrl(_exptAnnotations.getShortUrl());
+            _datasetStatus = DatasetStatusManager.getForExperiment(_exptAnnotations);
 
             // Action-specific validation
             doValidationForAction(errors);
@@ -10410,7 +10410,7 @@ public boolean handlePost(ShortUrlForm shortUrlForm, BindException errors) throw
                 if (_datasetStatus == null)
                 {
                     _datasetStatus = new DatasetStatus();
-                    _datasetStatus.setShortUrl(_exptAnnotations.getShortUrl());
+                    _datasetStatus.setExperimentAnnotationsId(_exptAnnotations.getId());
                     updateDatasetStatus(_datasetStatus);
                     DatasetStatusManager.save(_datasetStatus, getUser());
                 }
@@ -10458,13 +10458,13 @@ protected void doValidationForAction(Errors errors)
                 PrivateDataReminderSettings settings = PrivateDataReminderSettings.get();
                 if (settings.isExtensionValid(_datasetStatus))
                 {
-                    errors.reject(ERROR_MSG, "An extension has already been requested for the data with short URL " + _datasetStatus.getShortUrl().renderShortURL()
+                    errors.reject(ERROR_MSG, "An extension has already been requested for the data with short URL " + _exptAnnotations.getShortUrl().renderShortURL()
                             + ". The extension is valid until " + settings.extensionValidUntilFormatted(_datasetStatus));
                 }
                 else if (_datasetStatus.deletionRequested())
                 {
                     errors.reject(ERROR_MSG, "A deletion request was submitted on " + _datasetStatus.getDeletionRequestedDate()
-                            + " for the data with short URL " + _datasetStatus.getShortUrl().renderShortURL());
+                            + " for the data with short URL " + _exptAnnotations.getShortUrl().renderShortURL());
                 }
             }
         }
@@ -10522,7 +10522,7 @@ protected void doValidationForAction(Errors errors)
                 if (_datasetStatus.deletionRequested())
                 {
                     errors.reject(ERROR_MSG, "A deletion request was already submitted on " + _datasetStatus.getDeletionRequestedDateFormatted()
-                            + " for the data with short URL " + _datasetStatus.getShortUrl().renderShortURL());
+                            + " for the data with short URL " + _exptAnnotations.getShortUrl().renderShortURL());
                 }
             }
         }
diff --git a/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicModule.java b/panoramapublic/src/org/labkey/panoramapublic/PanoramaPublicModule.java
@@ -92,7 +92,7 @@ public String getName()
     @Override
     public @Nullable Double getSchemaVersion()
     {
-        return 25.002;
+        return 25.003;
     }
 
     @Override
diff --git a/panoramapublic/src/org/labkey/panoramapublic/model/DatasetStatus.java b/panoramapublic/src/org/labkey/panoramapublic/model/DatasetStatus.java
@@ -8,19 +8,19 @@
 
 public class DatasetStatus  extends DbEntity
 {
-    private ShortURLRecord _shortUrl;
+    private int _experimentAnnotationsId;
     private Date _lastReminderDate;
     private Date _extensionRequestedDate;
     private Date _deletionRequestedDate;
 
-    public ShortURLRecord getShortUrl()
+    public int getExperimentAnnotationsId()
     {
-        return _shortUrl;
+        return _experimentAnnotationsId;
     }
 
-    public void setShortUrl(ShortURLRecord shortUrl)
+    public void setExperimentAnnotationsId(int experimentAnnotationsId)
     {
-        _shortUrl = shortUrl;
+        _experimentAnnotationsId = experimentAnnotationsId;
     }
 
     public Date getLastReminderDate()
diff --git a/panoramapublic/src/org/labkey/panoramapublic/pipeline/CopyExperimentFinalTask.java b/panoramapublic/src/org/labkey/panoramapublic/pipeline/CopyExperimentFinalTask.java
@@ -151,12 +151,6 @@ private void finishUp(PipelineJob job, CopyExperimentJobSupport jobSupport) thro
 
             // Update the row in panoramapublic.ExperimentAnnotations - set the shortURL and version
             ExperimentAnnotations targetExperiment = updateExperimentAnnotations(container, sourceExperiment, js, user, log);
-            if (previousCopy != null)
-            {
-                // If this is a re-copy, a row may exist in DatasetStatus for the short URL associated with the experiment. Remove it now.
-                // This is a fresh copy, so data status should be reset.
-                DatasetStatusManager.deleteStatusForExperiment(targetExperiment);
-            }
 
             // If there is a Panorama Public data catalog entry associated with the previous copy of the experiment, move it to the
             // new container.
diff --git a/panoramapublic/src/org/labkey/panoramapublic/pipeline/PrivateDataReminderJob.java b/panoramapublic/src/org/labkey/panoramapublic/pipeline/PrivateDataReminderJob.java
@@ -100,7 +100,7 @@ private static ReminderDecision getReminderDecision(@NotNull ExperimentAnnotatio
             return ReminderDecision.skip("Not the current version of the experiment");
         }
 
-        DatasetStatus datasetStatus = DatasetStatusManager.getForShortUrl(exptAnnotations.getShortUrl());
+        DatasetStatus datasetStatus = DatasetStatusManager.getForExperiment(exptAnnotations);
         if (datasetStatus != null)
         {
             if (datasetStatus.deletionRequested())
@@ -293,11 +293,11 @@ private void postReminderMessage(ExperimentAnnotations expAnnotations, JournalSu
 
     private void updateDatasetStatus(ExperimentAnnotations expAnnotations)
     {
-        DatasetStatus datasetStatus = DatasetStatusManager.getForShortUrl(expAnnotations.getShortUrl());
+        DatasetStatus datasetStatus = DatasetStatusManager.getForExperiment(expAnnotations);
         if (datasetStatus == null)
         {
             datasetStatus = new DatasetStatus();
-            datasetStatus.setShortUrl(expAnnotations.getShortUrl());
+            datasetStatus.setExperimentAnnotationsId(expAnnotations.getId());
             datasetStatus.setLastReminderDate(new Date());
             DatasetStatusManager.save(datasetStatus, getUser());
         }
diff --git a/panoramapublic/src/org/labkey/panoramapublic/query/DatasetStatusManager.java b/panoramapublic/src/org/labkey/panoramapublic/query/DatasetStatusManager.java
@@ -7,7 +7,6 @@
 import org.labkey.api.data.TableSelector;
 import org.labkey.api.query.FieldKey;
 import org.labkey.api.security.User;
-import org.labkey.api.view.ShortURLRecord;
 import org.labkey.panoramapublic.PanoramaPublicManager;
 import org.labkey.panoramapublic.model.DatasetStatus;
 import org.labkey.panoramapublic.model.ExperimentAnnotations;
@@ -19,12 +18,12 @@ public static DatasetStatus get(int datasetStatusId)
         return new TableSelector(PanoramaPublicManager.getTableInfoDatasetStatus(),null, null).getObject(datasetStatusId, DatasetStatus.class);
     }
 
-    public static @Nullable DatasetStatus getForShortUrl(ShortURLRecord shortUrl)
+    public static @Nullable DatasetStatus getForExperiment(ExperimentAnnotations experimentAnnotations)
     {
-        if (shortUrl != null)
+        if (experimentAnnotations != null)
         {
             SimpleFilter filter = new SimpleFilter();
-            filter.addCondition(FieldKey.fromParts("ShortUrl"), shortUrl.getEntityId());
+            filter.addCondition(FieldKey.fromParts("ExperimentAnnotationsId"), experimentAnnotations.getId());
             return new TableSelector(PanoramaPublicManager.getTableInfoDatasetStatus(), filter, null).getObject(DatasetStatus.class);
         }
         return null;
@@ -42,12 +41,11 @@ public static void update(DatasetStatus datasetStatus, User user)
 
     public static void deleteStatusForExperiment(ExperimentAnnotations expAnnotations)
     {
-        DatasetStatus status = getForShortUrl(expAnnotations.getShortUrl());
-        if (status == null) return;
+        if (expAnnotations == null) return;
 
         try(DbScope.Transaction transaction = PanoramaPublicManager.getSchema().getScope().ensureTransaction())
         {
-            Table.delete(PanoramaPublicManager.getTableInfoDatasetStatus(), new SimpleFilter(FieldKey.fromParts("id"), status.getId()));
+            Table.delete(PanoramaPublicManager.getTableInfoDatasetStatus(), new SimpleFilter(FieldKey.fromParts("ExperimentAnnotationsId"), expAnnotations.getId()));
             transaction.commit();
         }
     }
diff --git a/panoramapublic/src/org/labkey/panoramapublic/query/DatasetStatusTableInfo.java b/panoramapublic/src/org/labkey/panoramapublic/query/DatasetStatusTableInfo.java
@@ -19,20 +19,13 @@ public class DatasetStatusTableInfo extends PanoramaPublicTable
     public DatasetStatusTableInfo(@NotNull PanoramaPublicSchema userSchema, ContainerFilter cf)
     {
         super(PanoramaPublicManager.getTableInfoDatasetStatus(), userSchema, cf,
-                new ContainerJoin("ShortUrl", PanoramaPublicManager.getTableInfoExperimentAnnotations(), "ShortUrl"));
+                new ContainerJoin("ExperimentAnnotationsId", PanoramaPublicManager.getTableInfoExperimentAnnotations(), "Id"));
 
+        var shortUrlCol = wrapColumn("ShortURL", getRealTable().getColumn("ExperimentAnnotationsId"));
+        shortUrlCol.setDisplayColumnFactory(new ShortUrlDisplayColumnFactory(FieldKey.fromParts("ShortUrl")));
+        addColumn(shortUrlCol);
 
-        var accessUrlCol = getMutableColumn(FieldKey.fromParts("ShortUrl"));
-        if (accessUrlCol != null)
-        {
-            accessUrlCol.setDisplayColumnFactory(new ShortUrlDisplayColumnFactory());
-        }
-
-        SQLFragment expColSql = new SQLFragment(" (SELECT Id FROM ")
-                .append(PanoramaPublicManager.getTableInfoExperimentAnnotations(), "exp")
-                .append(" WHERE exp.shortUrl = ").append(ExprColumn.STR_TABLE_ALIAS).append(".shortUrl")
-                .append(") ");
-        var experimentTitleCol = new ExprColumn(this, "Title", expColSql, JdbcType.VARCHAR);
+        var experimentTitleCol = wrapColumn("Title", getRealTable().getColumn(FieldKey.fromParts("ExperimentAnnotationsId")));
         experimentTitleCol.setFk(QueryForeignKey.from(getUserSchema(), cf).schema(getUserSchema()).to(PanoramaPublicSchema.TABLE_EXPERIMENT_ANNOTATIONS, "Id", null));
         addColumn(experimentTitleCol);
 
diff --git a/panoramapublic/src/org/labkey/panoramapublic/query/ExperimentAnnotationsManager.java b/panoramapublic/src/org/labkey/panoramapublic/query/ExperimentAnnotationsManager.java
@@ -283,10 +283,6 @@ private static void deleteExperiment(ExperimentAnnotations expAnnotations, User
         }
         else
         {
-            // Delete the row in DatasetStatus for this experiment. Do this before setting the experiment's shortURL to null
-            // in SubmissionManager.beforeCopiedExperimentDeleted().
-            DatasetStatusManager.deleteStatusForExperiment(expAnnotations);
-
             // This experiment is a journal copy (i.e. in the Panorama Public project on PanoramaWeb)
             SubmissionManager.beforeCopiedExperimentDeleted(expAnnotations, user);
         }
@@ -305,6 +301,9 @@ private static void deleteExperiment(ExperimentAnnotations expAnnotations, User
         // Delete the Panorama Public data catalog entry for this experiment, if one exists
         CatalogEntryManager.deleteEntryForExperiment(expAnnotations, user);
 
+        // Delete the row in DatasetStatus for this experiment, if one exists.
+        DatasetStatusManager.deleteStatusForExperiment(expAnnotations);
+
         Table.delete(PanoramaPublicManager.getTableInfoExperimentAnnotations(), expAnnotations.getId());
 
         if(expAnnotations.isJournalCopy() && expAnnotations.getShortUrl() != null)
diff --git a/panoramapublic/src/org/labkey/panoramapublic/query/ExperimentAnnotationsTableInfo.java b/panoramapublic/src/org/labkey/panoramapublic/query/ExperimentAnnotationsTableInfo.java
@@ -411,18 +411,18 @@ private ExprColumn getCatalogEntryCol()
 
     private ExprColumn getDatasetStatusCol(ContainerFilter cf)
     {
-        SQLFragment datasetStatusSql = new SQLFragment(" (SELECT status.shorturl AS DatasetStatus ")
+        SQLFragment datasetStatusSql = new SQLFragment(" (SELECT status.Id AS DatasetStatus ")
                 .append(" FROM ").append(PanoramaPublicManager.getTableInfoDatasetStatus(), "status")
                 .append(" WHERE ")
-                .append(" status.shortUrl = ").append(ExprColumn.STR_TABLE_ALIAS).append(".shortUrl")
+                .append(" status.experimentAnnotationsId = ").append(ExprColumn.STR_TABLE_ALIAS).append(".Id")
                 .append(") ");
-        ExprColumn col = new ExprColumn(this, "DatasetStatus", datasetStatusSql, JdbcType.VARCHAR);
+        ExprColumn col = new ExprColumn(this, "DatasetStatus", datasetStatusSql, JdbcType.INTEGER);
         col.setDescription("Dataset Status");
         col.setDisplayColumnFactory(DatasetStatusColumn::new);
 
         col.setFk(QueryForeignKey
                 .from(getUserSchema(), cf)
-                .to(PanoramaPublicSchema.TABLE_DATASET_STATUS, "shortUrl", null));
+                .to(PanoramaPublicSchema.TABLE_DATASET_STATUS, "Id", null));
         return col;
     }
 
@@ -876,7 +876,7 @@ public void renderGridCellContents(RenderContext ctx, HtmlWriter out)
 
     public static class DatasetStatusColumn extends DataColumn
     {
-        private final FieldKey ID_COL = new FieldKey(getColumnInfo().getFieldKey(), "id");
+        private final FieldKey EXPT_ANNOTATIONS_ID_COL = new FieldKey(getColumnInfo().getFieldKey(), "experimentAnnotationsId");
 
         public DatasetStatusColumn(ColumnInfo col)
         {
@@ -892,10 +892,10 @@ public Object getDisplayValue(RenderContext ctx)
             {
                 return "";
             }
-            Integer statusId = ctx.get(ID_COL, Integer.class);
+            Integer statusId = ctx.get(getColumnInfo().getFieldKey(), Integer.class);
 
             // Get the experiment connected with this status Id.
-            Integer experimentId = ctx.get(FieldKey.fromParts("id"), Integer.class);
+            Integer experimentId = ctx.get(EXPT_ANNOTATIONS_ID_COL, Integer.class);
             if (experimentId != null)
             {
                 ExperimentAnnotations expAnnot = ExperimentAnnotationsManager.get(experimentId);
@@ -925,7 +925,7 @@ public Object getDisplayValue(RenderContext ctx)
         public void addQueryFieldKeys(Set<FieldKey> keys)
         {
             super.addQueryFieldKeys(keys);
-            keys.add(ID_COL);
+            keys.add(EXPT_ANNOTATIONS_ID_COL);
         }
 
         @Override
diff --git a/panoramapublic/src/org/labkey/panoramapublic/query/JournalManager.java b/panoramapublic/src/org/labkey/panoramapublic/query/JournalManager.java
@@ -162,7 +162,6 @@ public static void delete(Journal journal, User user)
         List<ExperimentAnnotations> expAnnotations = getExperimentsForJournal(journal.getId());
         for(ExperimentAnnotations expAnnotation: expAnnotations)
         {
-            DatasetStatusManager.deleteStatusForExperiment(expAnnotation);
             removeJournalAccess(expAnnotation, journal, user);
         }
         SubmissionManager.deleteAllSubmissionsForJournal(journal.getId());

Original file line number	Diff line number	Diff line change
`@@ -10396,7 +10396,7 @@ public void validateCommand(ShortUrlForm shortUrlForm, Errors errors)`
`10396`	`10396`
`10397`	`10397`	`ensureCorrectContainer(getContainer(), _exptAnnotations.getContainer(), getViewContext());`
`10398`	`10398`
`10399`		`- _datasetStatus = DatasetStatusManager.getForShortUrl(_exptAnnotations.getShortUrl());`
	`10399`	`+ _datasetStatus = DatasetStatusManager.getForExperiment(_exptAnnotations);`
`10400`	`10400`
`10401`	`10401`	`// Action-specific validation`
`10402`	`10402`	`doValidationForAction(errors);`
`@@ -10410,7 +10410,7 @@ public boolean handlePost(ShortUrlForm shortUrlForm, BindException errors) throw`
`10410`	`10410`	`if (_datasetStatus == null)`
`10411`	`10411`	`{`
`10412`	`10412`	`_datasetStatus = new DatasetStatus();`
`10413`		`- _datasetStatus.setShortUrl(_exptAnnotations.getShortUrl());`
	`10413`	`+ _datasetStatus.setExperimentAnnotationsId(_exptAnnotations.getId());`
`10414`	`10414`	`updateDatasetStatus(_datasetStatus);`
`10415`	`10415`	`DatasetStatusManager.save(_datasetStatus, getUser());`
`10416`	`10416`	`}`
`@@ -10458,13 +10458,13 @@ protected void doValidationForAction(Errors errors)`
`10458`	`10458`	`PrivateDataReminderSettings settings = PrivateDataReminderSettings.get();`
`10459`	`10459`	`if (settings.isExtensionValid(_datasetStatus))`
`10460`	`10460`	`{`
`10461`		`- errors.reject(ERROR_MSG, "An extension has already been requested for the data with short URL " + _datasetStatus.getShortUrl().renderShortURL()`
	`10461`	`+ errors.reject(ERROR_MSG, "An extension has already been requested for the data with short URL " + _exptAnnotations.getShortUrl().renderShortURL()`
`10462`	`10462`	`+ ". The extension is valid until " + settings.extensionValidUntilFormatted(_datasetStatus));`
`10463`	`10463`	`}`
`10464`	`10464`	`else if (_datasetStatus.deletionRequested())`
`10465`	`10465`	`{`
`10466`	`10466`	`errors.reject(ERROR_MSG, "A deletion request was submitted on " + _datasetStatus.getDeletionRequestedDate()`
`10467`		`- + " for the data with short URL " + _datasetStatus.getShortUrl().renderShortURL());`
	`10467`	`+ + " for the data with short URL " + _exptAnnotations.getShortUrl().renderShortURL());`
`10468`	`10468`	`}`
`10469`	`10469`	`}`
`10470`	`10470`	`}`
`@@ -10522,7 +10522,7 @@ protected void doValidationForAction(Errors errors)`
`10522`	`10522`	`if (_datasetStatus.deletionRequested())`
`10523`	`10523`	`{`
`10524`	`10524`	`errors.reject(ERROR_MSG, "A deletion request was already submitted on " + _datasetStatus.getDeletionRequestedDateFormatted()`
`10525`		`- + " for the data with short URL " + _datasetStatus.getShortUrl().renderShortURL());`
	`10525`	`+ + " for the data with short URL " + _exptAnnotations.getShortUrl().renderShortURL());`
`10526`	`10526`	`}`
`10527`	`10527`	`}`
`10528`	`10528`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public String getName()`
`92`	`92`	`@Override`
`93`	`93`	`public @Nullable Double getSchemaVersion()`
`94`	`94`	`{`
`95`		`- return 25.002;`
	`95`	`+ return 25.003;`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -8,19 +8,19 @@`
`8`	`8`
`9`	`9`	`public class DatasetStatus extends DbEntity`
`10`	`10`	`{`
`11`		`- private ShortURLRecord _shortUrl;`
	`11`	`+ private int _experimentAnnotationsId;`
`12`	`12`	`private Date _lastReminderDate;`
`13`	`13`	`private Date _extensionRequestedDate;`
`14`	`14`	`private Date _deletionRequestedDate;`
`15`	`15`
`16`		`- public ShortURLRecord getShortUrl()`
	`16`	`+ public int getExperimentAnnotationsId()`
`17`	`17`	`{`
`18`		`- return _shortUrl;`
	`18`	`+ return _experimentAnnotationsId;`
`19`	`19`	`}`
`20`	`20`
`21`		`- public void setShortUrl(ShortURLRecord shortUrl)`
	`21`	`+ public void setExperimentAnnotationsId(int experimentAnnotationsId)`
`22`	`22`	`{`
`23`		`- _shortUrl = shortUrl;`
	`23`	`+ _experimentAnnotationsId = experimentAnnotationsId;`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public Date getLastReminderDate()`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ private static ReminderDecision getReminderDecision(@NotNull ExperimentAnnotatio`
`100`	`100`	`return ReminderDecision.skip("Not the current version of the experiment");`
`101`	`101`	`}`
`102`	`102`
`103`		`- DatasetStatus datasetStatus = DatasetStatusManager.getForShortUrl(exptAnnotations.getShortUrl());`
	`103`	`+ DatasetStatus datasetStatus = DatasetStatusManager.getForExperiment(exptAnnotations);`
`104`	`104`	`if (datasetStatus != null)`
`105`	`105`	`{`
`106`	`106`	`if (datasetStatus.deletionRequested())`
`@@ -293,11 +293,11 @@ private void postReminderMessage(ExperimentAnnotations expAnnotations, JournalSu`
`293`	`293`
`294`	`294`	`private void updateDatasetStatus(ExperimentAnnotations expAnnotations)`
`295`	`295`	`{`
`296`		`- DatasetStatus datasetStatus = DatasetStatusManager.getForShortUrl(expAnnotations.getShortUrl());`
	`296`	`+ DatasetStatus datasetStatus = DatasetStatusManager.getForExperiment(expAnnotations);`
`297`	`297`	`if (datasetStatus == null)`
`298`	`298`	`{`
`299`	`299`	`datasetStatus = new DatasetStatus();`
`300`		`- datasetStatus.setShortUrl(expAnnotations.getShortUrl());`
	`300`	`+ datasetStatus.setExperimentAnnotationsId(expAnnotations.getId());`
`301`	`301`	`datasetStatus.setLastReminderDate(new Date());`
`302`	`302`	`DatasetStatusManager.save(datasetStatus, getUser());`
`303`	`303`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`import org.labkey.api.data.TableSelector;`
`8`	`8`	`import org.labkey.api.query.FieldKey;`
`9`	`9`	`import org.labkey.api.security.User;`
`10`		`-import org.labkey.api.view.ShortURLRecord;`
`11`	`10`	`import org.labkey.panoramapublic.PanoramaPublicManager;`
`12`	`11`	`import org.labkey.panoramapublic.model.DatasetStatus;`
`13`	`12`	`import org.labkey.panoramapublic.model.ExperimentAnnotations;`
`@@ -19,12 +18,12 @@ public static DatasetStatus get(int datasetStatusId)`
`19`	`18`	`return new TableSelector(PanoramaPublicManager.getTableInfoDatasetStatus(),null, null).getObject(datasetStatusId, DatasetStatus.class);`
`20`	`19`	`}`
`21`	`20`
`22`		`- public static @Nullable DatasetStatus getForShortUrl(ShortURLRecord shortUrl)`
	`21`	`+ public static @Nullable DatasetStatus getForExperiment(ExperimentAnnotations experimentAnnotations)`
`23`	`22`	`{`
`24`		`- if (shortUrl != null)`
	`23`	`+ if (experimentAnnotations != null)`
`25`	`24`	`{`
`26`	`25`	`SimpleFilter filter = new SimpleFilter();`
`27`		`- filter.addCondition(FieldKey.fromParts("ShortUrl"), shortUrl.getEntityId());`
	`26`	`+ filter.addCondition(FieldKey.fromParts("ExperimentAnnotationsId"), experimentAnnotations.getId());`
`28`	`27`	`return new TableSelector(PanoramaPublicManager.getTableInfoDatasetStatus(), filter, null).getObject(DatasetStatus.class);`
`29`	`28`	`}`
`30`	`29`	`return null;`
`@@ -42,12 +41,11 @@ public static void update(DatasetStatus datasetStatus, User user)`
`42`	`41`
`43`	`42`	`public static void deleteStatusForExperiment(ExperimentAnnotations expAnnotations)`
`44`	`43`	`{`
`45`		`- DatasetStatus status = getForShortUrl(expAnnotations.getShortUrl());`
`46`		`- if (status == null) return;`
	`44`	`+ if (expAnnotations == null) return;`
`47`	`45`
`48`	`46`	`try(DbScope.Transaction transaction = PanoramaPublicManager.getSchema().getScope().ensureTransaction())`
`49`	`47`	`{`
`50`		`- Table.delete(PanoramaPublicManager.getTableInfoDatasetStatus(), new SimpleFilter(FieldKey.fromParts("id"), status.getId()));`
	`48`	`+ Table.delete(PanoramaPublicManager.getTableInfoDatasetStatus(), new SimpleFilter(FieldKey.fromParts("ExperimentAnnotationsId"), expAnnotations.getId()));`
`51`	`49`	`transaction.commit();`
`52`	`50`	`}`
`53`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -283,10 +283,6 @@ private static void deleteExperiment(ExperimentAnnotations expAnnotations, User`
`283`	`283`	`}`
`284`	`284`	`else`
`285`	`285`	`{`
`286`		`- // Delete the row in DatasetStatus for this experiment. Do this before setting the experiment's shortURL to null`
`287`		`- // in SubmissionManager.beforeCopiedExperimentDeleted().`
`288`		`- DatasetStatusManager.deleteStatusForExperiment(expAnnotations);`
`289`		`-`
`290`	`286`	`// This experiment is a journal copy (i.e. in the Panorama Public project on PanoramaWeb)`
`291`	`287`	`SubmissionManager.beforeCopiedExperimentDeleted(expAnnotations, user);`
`292`	`288`	`}`
`@@ -305,6 +301,9 @@ private static void deleteExperiment(ExperimentAnnotations expAnnotations, User`
`305`	`301`	`// Delete the Panorama Public data catalog entry for this experiment, if one exists`
`306`	`302`	`CatalogEntryManager.deleteEntryForExperiment(expAnnotations, user);`
`307`	`303`
	`304`	`+ // Delete the row in DatasetStatus for this experiment, if one exists.`
	`305`	`+ DatasetStatusManager.deleteStatusForExperiment(expAnnotations);`
	`306`	`+`
`308`	`307`	`Table.delete(PanoramaPublicManager.getTableInfoExperimentAnnotations(), expAnnotations.getId());`
`309`	`308`
`310`	`309`	`if(expAnnotations.isJournalCopy() && expAnnotations.getShortUrl() != null)`