Skip to content

Commit

Permalink
expect artifact_type to be upper case (except 'main')
Browse files Browse the repository at this point in the history
  • Loading branch information
edoshor committed Dec 31, 2019
1 parent 8dfe569 commit 7a2bfc3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion api/metadata_processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ func doProcess(exec boil.Executor, metadata CITMetadata, original, proxy *models
if c != nil &&
(!metadata.ArtifactType.Valid ||
metadata.ArtifactType.String == "main" ||
metadata.ArtifactType.String == "ktaim_nivcharim") {
metadata.ArtifactType.String == "KTAIM_NIVCHARIM") {
err := associateUnitToCollection(exec, cu, c, metadata)
if err != nil {
return nil, errors.Wrap(err, "associate content_unit to collection")
Expand Down
6 changes: 3 additions & 3 deletions api/metadata_processor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ func (suite *MetadataProcessorSuite) TestDailyLesson() {
// process ktaim nivcharim from full
metadata.ContentType = common.CT_FULL_LESSON
metadata.Part = null.IntFrom(-1)
metadata.ArtifactType = null.StringFrom("ktaim_nivcharim")
metadata.ArtifactType = null.StringFrom("KTAIM_NIVCHARIM")
metadata.WeekDate = nil
tf = chain["ktaim-nivcharim"]
original, proxy = tf.Original, tf.Proxy
Expand All @@ -273,7 +273,7 @@ func (suite *MetadataProcessorSuite) TestDailyLesson() {
suite.Require().Len(cu.R.DerivedContentUnitDerivations, 1, "cu.R.DerivationContentUnitDerivations length")
cud = cu.R.DerivedContentUnitDerivations[0]
suite.Equal(chain["full"].Original.ContentUnitID.Int64, cud.SourceID, "cud.SourceID")
suite.Equal("ktaim_nivcharim", cud.Name, "cud.Name")
suite.Equal("KTAIM_NIVCHARIM", cud.Name, "cud.Name")
err = cu.Properties.Unmarshal(&props)
suite.Require().Nil(err)
_, ok = props["artifact_type"]
Expand All @@ -284,7 +284,7 @@ func (suite *MetadataProcessorSuite) TestDailyLesson() {
suite.Require().Nil(err)
suite.Equal(1, len(cu.R.CollectionsContentUnits), "len(cu.R.CollectionsContentUnits)")
ccu = cu.R.CollectionsContentUnits[0]
suite.Equal("ktaim_nivcharim_1", ccu.Name, "ccu.Name")
suite.Equal("KTAIM_NIVCHARIM_1", ccu.Name, "ccu.Name")
suite.Equal(6, ccu.Position, "ccu.Position")
suite.Equal(c.ID, ccu.CollectionID, "ccu.CollectionID")
}
Expand Down

0 comments on commit 7a2bfc3

Please sign in to comment.