Skip to content

Commit a47e5a8

Browse files
committed
#39: Added tests for AboutCodeDB
* Removed old, unused tests * Updated model definition data types * Added chaiSubset library Signed-off-by: Jillian Daguil <[email protected]>
1 parent f2bee3d commit a47e5a8

File tree

7 files changed

+2525
-1237
lines changed

7 files changed

+2525
-1237
lines changed

assets/js/aboutCodeDB.js

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -186,27 +186,27 @@ class AboutCodeDB {
186186
name: Sequelize.STRING,
187187
extension: Sequelize.STRING,
188188
date: Sequelize.STRING,
189-
size: Sequelize.STRING,
189+
size: Sequelize.INTEGER,
190190
sha1: Sequelize.STRING,
191191
md5: Sequelize.STRING,
192192
files_count: Sequelize.INTEGER,
193193
mime_type: Sequelize.STRING,
194194
file_type: Sequelize.STRING,
195195
programming_language: Sequelize.STRING,
196-
is_binary: Sequelize.STRING,
197-
is_text: Sequelize.STRING,
198-
is_archive: Sequelize.STRING,
199-
is_media: Sequelize.STRING,
200-
is_source: Sequelize.STRING,
201-
is_script: Sequelize.STRING
196+
is_binary: Sequelize.BOOLEAN,
197+
is_text: Sequelize.BOOLEAN,
198+
is_archive: Sequelize.BOOLEAN,
199+
is_media: Sequelize.BOOLEAN,
200+
is_source: Sequelize.BOOLEAN,
201+
is_script: Sequelize.BOOLEAN
202202
});
203203
}
204-
204+
// TODO (@jdaguil): Add matched_rule to license model
205205
// License Model definitions
206206
static licenseModel(sequelize) {
207207
return sequelize.define("licenses", {
208208
key: Sequelize.STRING,
209-
score: Sequelize.STRING,
209+
score: Sequelize.INTEGER,
210210
short_name: Sequelize.STRING,
211211
category: Sequelize.STRING,
212212
owner: Sequelize.STRING,
@@ -215,21 +215,23 @@ class AboutCodeDB {
215215
dejacode_url: Sequelize.STRING,
216216
spdx_license_key: Sequelize.STRING,
217217
spdx_url: Sequelize.STRING,
218-
start_line: Sequelize.STRING,
219-
end_line: Sequelize.STRING
218+
start_line: Sequelize.INTEGER,
219+
end_line: Sequelize.INTEGER
220220
});
221221
}
222222

223+
// TODO (@jdaguil): Add author to copyright model
223224
// Copyright Model definitions
224225
static copyrightModel(sequelize) {
225226
return sequelize.define("copyrights", {
226-
start_line: Sequelize.STRING,
227-
end_line: Sequelize.STRING,
227+
start_line: Sequelize.INTEGER,
228+
end_line: Sequelize.INTEGER,
228229
holders: AboutCodeDB.jsonDataType('holders'),
229230
statements: AboutCodeDB.jsonDataType('statements')
230231
});
231232
}
232233

234+
// TODO (@jdaguil): Add other package attributes to package model
233235
// Package Model definitions
234236
static packageModel(sequelize) {
235237
return sequelize.define("packages", {
@@ -243,17 +245,17 @@ class AboutCodeDB {
243245
static emailModel(sequelize) {
244246
return sequelize.define("emails", {
245247
email: Sequelize.STRING,
246-
start_line: Sequelize.STRING,
247-
end_line: Sequelize.STRING
248+
start_line: Sequelize.INTEGER,
249+
end_line: Sequelize.INTEGER
248250
});
249251
}
250252

251253
// URL Model definitions
252254
static urlModel(sequelize) {
253255
return sequelize.define("urls", {
254256
url: Sequelize.STRING,
255-
start_line: Sequelize.STRING,
256-
end_line: Sequelize.STRING
257+
start_line: Sequelize.INTEGER,
258+
end_line: Sequelize.INTEGER
257259
});
258260
}
259261

0 commit comments

Comments
 (0)